From: martin f. krafft Date: Sat, 31 May 2008 15:08:02 +0000 (+0200) Subject: improved installation X-Git-Tag: 0.4.2~1 X-Git-Url: https://git.madduck.net/code/molly-guard.git/commitdiff_plain/9050196151b719e13cecd9fd39ee5a99130b1100?ds=inline;hp=842c0f9058ada9b8d7ccca624333803d1404bb22 improved installation --- diff --git a/Makefile b/Makefile index c0d34f4..c4ccf7f 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ clean: .PHONY: clean shutdown: shutdown.in - sed -e 's,@ETC_PREFIX@,$(etc_prefix),g' $< > $@ + sed -e 's,@ETCDIR@,$(ETCDIR),g' $< > $@ install: shutdown molly-guard.8.gz mkdir -m755 --parent $(DST)/share/molly-guard diff --git a/shutdown.in b/shutdown.in index 32ba58d..cac4d63 100755 --- a/shutdown.in +++ b/shutdown.in @@ -10,7 +10,7 @@ set -eu ME=molly-guard VERSION=0.4 -SCRIPTSDIR="@ETC_PREFIX@/etc/$ME/run.d" +SCRIPTSDIR="@ETCDIR@/run.d" CMD="${0##*/}" EXEC="/sbin/$CMD" @@ -104,7 +104,7 @@ esac MOLLYGUARD_CMD=$CMD; export MOLLYGUARD_CMD MOLLYGUARD_DO_NOTHING=$DO_NOTHING; export MOLLYGUARD_DO_NOTHING -MOLLYGUARD_SETTINGS="@ETC_PREFIX@/etc/$ME/rc"; export MOLLYGUARD_SETTINGS +MOLLYGUARD_SETTINGS="@ETCDIR@/rc"; export MOLLYGUARD_SETTINGS for script in $(run-parts --test $SCRIPTSDIR); do ret=0