From c8861008563a37695e74e1614812ef1d772b5f87 Mon Sep 17 00:00:00 2001 From: mananapr Date: Mon, 15 Jul 2019 21:21:33 +0530 Subject: [PATCH] Packaging changes --- Makefile | 18 ++++++++++-------- config.h | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 1a541ef..56a5429 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,12 @@ PROG = cfiles prefix = usr bindir = $(prefix)/bin +scriptdir = $(prefix)/share/cfiles/scripts mandir = $(prefix)/share/man BINDIR = $(DESTDIR)/$(bindir) MANDIR = $(DESTDIR)/$(mandir) +SCRIPTDIR = $(DESTDIR)/$(scriptdir) all: $(OBJS) $(CC) $(CFLAGS) $(OBJS) -o $(PROG) $(LIBS) @@ -29,17 +31,17 @@ clean: install: install -Dm 755 $(PROG) $(BINDIR)/$(PROG) - install -Dm 755 scripts/clearimg $(BINDIR)/clearimg - install -Dm 755 scripts/displayimg $(BINDIR)/displayimg - install -Dm 755 scripts/displayimg_uberzug $(BINDIR)/displayimg_uberzug - install -Dm 755 scripts/clearimg_uberzug $(BINDIR)/clearimg_uberzug + install -Dm 755 scripts/clearimg $(SCRIPTDIR)/clearimg + install -Dm 755 scripts/displayimg $(SCRIPTDIR)/displayimg + install -Dm 755 scripts/displayimg_uberzug $(SCRIPTDIR)/displayimg_uberzug + install -Dm 755 scripts/clearimg_uberzug $(SCRIPTDIR)/clearimg_uberzug install -Dm 644 cfiles.1 $(MANDIR)/man1/cfiles.1 uninstall: rm -v $(BINDIR)/$(PROG) - rm -v $(BINDIR)/clearimg - rm -v $(BINDIR)/clearimg_uberzug - rm -v $(BINDIR)/displayimg_uberzug - rm -v $(BINDIR)/displayimg + rm -v $(SCRIPTDIR)/clearimg + rm -v $(SCRIPTDIR)/clearimg_uberzug + rm -v $(SCRIPTDIR)/displayimg_uberzug + rm -v $(SCRIPTDIR)/displayimg rm -v $(MANDIR)/man1/cfiles.1 diff --git a/config.h b/config.h index 93f9c10..5208b72 100644 --- a/config.h +++ b/config.h @@ -22,10 +22,10 @@ #define FILE_OPENER "xdg-open" // Display Image Script -#define DISPLAYIMG "/usr/bin/displayimg_uberzug" +#define DISPLAYIMG "/usr/share/cfiles/scripts/displayimg_uberzug" // Clear Image Preview Script -#define CLEARIMG "/usr/bin/clearimg_uberzug" +#define CLEARIMG "/usr/share/cfiles/scripts/clearimg_uberzug" /*