From aff759b81dba77aa94c4582d893c931132c1612d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Dec 2016 14:07:22 +0000 Subject: adjust makefile, prepare to ship sisyphus --- Makefile | 19 ++++++++++--------- libsisyphus.sh | 14 +++++++------- sisyphus | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index b49d401..1670397 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,8 @@ SUBDIRS = DESTDIR = UBINDIR ?= /usr/bin -LIBDIR ?= /usr/lib -SBINDIR ?= /sbin -USBINDIR ?= /usr/sbin -BINDIR ?= /bin -LIBEXECDIR ?= /usr/libexec +LIBSISYPHUSDIR ?= /usr/lib/sisyphus POLKITDIR ?= /usr/share/polkit-1/actions -SYSCONFDIR ?= /etc -SYSTEMD_UNITDIR ?= $(LIBDIR)/systemd/system all: for d in $(SUBDIRS); do $(MAKE) -C $$d; done @@ -21,7 +15,14 @@ install: install -d $(DESTDIR)$(UBINDIR) install -m 0755 sisyphus $(DESTDIR)$(UBINDIR)/ - install -d $(DESTDIR)$(LIBDIR) - install -m 0755 libsisyphus $(DESTDIR)$(LIBDIR)/ + install -d $(DESTDIR)$(LIBSISYPHUSDIR) + install -m 0755 libsisyphus.sh $(DESTDIR)$(LIBSISYPHUSDIR)/ + install -m 0755 accesoriesui.sh $(DESTDIR)$(LIBSISYPHUSDIR)/ + install -m 0755 gamesui.sh $(DESTDIR)$(LIBSISYPHUSDIR)/ + install -m 0755 graphicsui.sh $(DESTDIR)$(LIBSISYPHUSDIR)/ + install -m 0755 internetui.sh $(DESTDIR)$(LIBSISYPHUSDIR)/ + install -m 0755 multimediaui.sh $(DESTDIR)$(LIBSISYPHUSDIR)/ + install -m 0755 officeui.sh $(DESTDIR)$(LIBSISYPHUSDIR)/ + install -m 0755 systemui.sh $(DESTDIR)$(LIBSISYPHUSDIR)/ install -d $(DESTDIR)$(POLKITDIR) install -m 0644 org.redcorelinux.sisyphus.policy $(DESTDIR)$(POLKITDIR)/ diff --git a/libsisyphus.sh b/libsisyphus.sh index 41e6b43..a9248ca 100755 --- a/libsisyphus.sh +++ b/libsisyphus.sh @@ -4,13 +4,13 @@ export local showdialog="yad --title "sisyphus" --text-info --width 800 --height 600 --center --no-buttons --on-top --sticky --fixed --skip-taskbar --listen --tail &" # import user interfaces -source accesoriesui.sh -source gamesui.sh -source graphicsui.sh -source internetui.sh -source multimediaui.sh -source officeui.sh -source systemui.sh +source /usr/lib64/sisyphus/accesoriesui.sh +source /usr/lib64/sisyphus/gamesui.sh +source /usr/lib64/sisyphus/graphicsui.sh +source /usr/lib64/sisyphus/internetui.sh +source /usr/lib64/sisyphus/multimediaui.sh +source /usr/lib64/sisyphus/officeui.sh +source /usr/lib64/sisyphus/systemui.sh # create main user interface export local mainui=' diff --git a/sisyphus b/sisyphus index 3468889..9121677 100755 --- a/sisyphus +++ b/sisyphus @@ -5,7 +5,7 @@ # Main Author : Ghiunhan Mamut @ Redcore Linux Project # import main user interface -source libsisyphus.sh +source /usr/lib64/sisyphus/libsisyphus.sh main() { gtkdialog --space-expand=true --space-fill=true --program=mainui & -- cgit v1.2.3