From be3665b276b73c00881f59e08367f5fbbac7771f Mon Sep 17 00:00:00 2001 From: Thibault Godouet Date: Wed, 5 Dec 2012 19:49:46 +0000 Subject: [PATCH] generate init scripts in 'make all' rather than 'make install' (so as they are not owned by root) --- Makefile.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1830e04..c4b6d62 100644 --- a/Makefile.in +++ b/Makefile.in @@ -95,7 +95,7 @@ else endif ifeq ($(FCRONDYN), 1) -all: fcron fcrontab fcrondyn convert-fcrontab files/fcron.conf +all: fcron fcrontab fcrondyn convert-fcrontab files/fcron.conf initscripts else all: fcron fcrontab convert-fcrontab files/fcron.conf endif @@ -129,12 +129,12 @@ exe_list_test: exe_list.o u_list.o exe_list_test.o log.o subs.o -c $< initscripts: - if test ! -d script; then mkdir script ; fi - for F in sysVinit-launcher fcron.sh fcron.init.suse fcron.init.systemd ; do \ - $(SRCDIR)/script/gen-in.pl $(SRCDIR)/script/$${F}.in script/$${F} ./ ; \ - done + @(if test ! -d script; then mkdir script ; fi ; \ + for F in sysVinit-launcher fcron.sh fcron.init.suse fcron.init.systemd ; do \ + $(SRCDIR)/script/gen-in.pl $(SRCDIR)/script/$${F}.in script/$${F} ./ ; \ + done) -install: install-staged strip perms initscripts +install: install-staged strip perms ifeq ($(BOOTINSTALL), 1) $(SRCDIR)/script/boot-install "$(INSTALL) -o $(ROOTNAME)" $(DESTSBIN) $(DEBUG) $(FCRONTABS) $(ANSWERALL) $(SRCDIR) endif @@ -237,7 +237,7 @@ ifeq ($(FCRONDYN), 1) strip $(DESTDIR)$(DESTBIN)/fcrondyn endif -install-boot: install initscripts +install-boot: install $(SRCDIR)/script/boot-install "$(INSTALL) -o $(ROOTNAME)" $(DESTSBIN) $(DEBUG) $(FCRONTABS) $(ANSWERALL) $(SRCDIR) install-restart: install -- 2.40.0