diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2010-06-09 09:26:16 +0200 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2010-06-09 09:29:57 +0200 |
commit | ee6f6f2382bce837898c3ec324e244333bcaff41 (patch) | |
tree | 1d4a8397607c19dd1d7c316350abe79f7a9d74e8 | |
parent | 4a8911140a429184d7f9105ba2f049c631381e9f (diff) | |
download | quilt-ee6f6f2382bce837898c3ec324e244333bcaff41.tar.gz |
Do not hard-code the location of /etc; use $(etcdir) instead
-rw-r--r-- | Makefile.in | 1 | ||||
-rw-r--r-- | bin/quilt.in | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 331035d..8103dae 100644 --- a/Makefile.in +++ b/Makefile.in @@ -265,6 +265,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in quilt/*.in quilt/scripts/*.in)) :: Makefil -e 's:@PATCH''@:$(PATCH):g' \ -e 's:@VERSION''@:$(VERSION):g' \ -e 's:@RELEASE''@:$(RELEASE):g' \ + -e 's:@ETCDIR''@:$(etcdir):g' \ -e 's:@LOCALEDIR''@:$(localedir):g' \ -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ $< > $@ diff --git a/bin/quilt.in b/bin/quilt.in index 66ad983..61114ad 100644 --- a/bin/quilt.in +++ b/bin/quilt.in @@ -14,7 +14,7 @@ export QUILT_DIR QUILT_LIB if [ -z "$QUILTRC" ] then - for QUILTRC in $HOME/.quiltrc /etc/quilt.quiltrc; do + for QUILTRC in $HOME/.quiltrc @ETCDIR@/quilt.quiltrc; do [ -e $QUILTRC ] && break done export QUILTRC @@ -45,7 +45,7 @@ Global options: --quiltrc file Use the specified configuration file instead of ~/.quiltrc (or - /etc/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf + @ETCDIR@/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf documentation for details about its possible contents. The special value \"-\" causes quilt not to read any configuration file. |