]> git.madduck.net Git - code/molly-guard.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

improved installation
authormartin f. krafft <madduck@madduck.net>
Sat, 31 May 2008 15:08:02 +0000 (17:08 +0200)
committermartin f. krafft <madduck@madduck.net>
Sat, 31 May 2008 15:08:02 +0000 (17:08 +0200)
Makefile
shutdown.in

index c0d34f4f13c215d5bbc58143fad4b9876b0b3151..c4ccf7f16b984ed6856bac5aa52bcb42b668a05e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ clean:
 .PHONY: clean
 
 shutdown: shutdown.in
 .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
 
 install: shutdown molly-guard.8.gz
        mkdir -m755 --parent $(DST)/share/molly-guard
index 32ba58d8fc299c970889cddc2c7bcacbb1dc680e..cac4d6312fae78d93785b76626e10ec9f6833c0b 100755 (executable)
@@ -10,7 +10,7 @@ set -eu
 ME=molly-guard
 VERSION=0.4
 
 ME=molly-guard
 VERSION=0.4
 
-SCRIPTSDIR="@ETC_PREFIX@/etc/$ME/run.d"
+SCRIPTSDIR="@ETCDIR@/run.d"
 
 CMD="${0##*/}"
 EXEC="/sbin/$CMD"
 
 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_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
 
 for script in $(run-parts --test $SCRIPTSDIR); do
   ret=0