diff options
| author |  axel <axel@liljencrantz.se> | 2006-07-24 03:04:02 +1000 |
|---|---|---|
| committer | axel <axel@liljencrantz.se> | 2006-07-24 03:04:02 +1000 |
| commit | c9eb74fa4bf38c47b530cbff3ebd925e3cde874b (patch) | |
| tree | a709bde79b8f02d648f4adb72c14e9dd9d37e2ad | |
| parent | b2d940c25a56e0f4dfcf5d3783bea63622680718 (diff) | |
Add missing Substitutions of prefix and optbindirs variables in share/fish.in
darcs-hash:20060723170402-ac50b-551cff33ca0e831505b5891fada0a017c3ea1370.gz
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | share/fish.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 342794e6..b4421824 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,6 +46,7 @@ sysconfdir = @sysconfdir@ docdir = @docdir@ localedir = @localedir@ prefix = @prefix@ +optbindirs = @optbindirs@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ MACROS=-DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" @@ -251,7 +252,7 @@ doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr echo "*/" >>$@ %: %.in Makefile - sed <$@.in >$@ -e "s,@sysconfdir\@,$(sysconfdir)," -e "s,@datadir\@,$(datadir)," -e "s,@docdir\@,$(docdir)," -e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|" + sed <$@.in >$@ -e "s,@sysconfdir\@,$(sysconfdir)," -e "s,@datadir\@,$(datadir)," -e "s,@docdir\@,$(docdir)," -e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|" -e "s,@prefix\@,$(prefix)," -e "s,@optbindirs\@,$(optbindirs)," #-e "s,@\@,$()," # Compile translation file diff --git a/share/fish.in b/share/fish.in index 1ef7c4f0..f25b439f 100644 --- a/share/fish.in +++ b/share/fish.in @@ -35,7 +35,7 @@ end # want this even for text-only terminals. # -set -l path_list /bin /usr/bin /usr/X11R6/bin @PREFIX@/bin @optbindirs@ +set -l path_list /bin /usr/bin /usr/X11R6/bin @prefix@/bin @optbindirs@ # Root should also have the sbin directories in the path if test "$USER" = root |