From c9eb74fa4bf38c47b530cbff3ebd925e3cde874b Mon Sep 17 00:00:00 2001
From: axel <axel@liljencrantz.se>
Date: Mon, 24 Jul 2006 03:04:02 +1000
Subject: [PATCH] Add missing Substitutions of prefix and optbindirs variables
 in share/fish.in

darcs-hash:20060723170402-ac50b-551cff33ca0e831505b5891fada0a017c3ea1370.gz
---
 Makefile.in   | 3 ++-
 share/fish.in | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 342794e6a..b44218243 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 1ef7c4f08..f25b439f1 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