diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | etc/fish_interactive.fish.in | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 3df5e56e..07a6535c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -186,7 +186,7 @@ TRANSLATIONS_SRC := $(wildcard po/*.po) TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo) #Make everything needed for installing fish -all: $(PROGRAMS) user_doc etc/fish share/fish $(TRANSLATIONS) +all: $(PROGRAMS) user_doc etc/fish share/fish etc/fish_interactive.fish $(TRANSLATIONS) @echo fish has now been built. @echo Use \'make install\' to install fish. .PHONY: all diff --git a/configure.ac b/configure.ac index 7123ea24..a30142f4 100644 --- a/configure.ac +++ b/configure.ac @@ -343,7 +343,7 @@ case $target_os in esac # Tell the world what we know -AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile etc/fish_interactive.fish seq]) +AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile seq]) AC_OUTPUT echo "fish is now configured." diff --git a/etc/fish_interactive.fish.in b/etc/fish_interactive.fish.in index bace35a2..0e5d5543 100644 --- a/etc/fish_interactive.fish.in +++ b/etc/fish_interactive.fish.in @@ -30,10 +30,10 @@ end # be exported, since the fish inputrc file plays nice with other files # by including them when found. # Give priority to the default file installed with fish in -# @SYSCONFDIR@/fish_inputrc. +# @sysconfdir@/fish_inputrc. # -for i in ~/.fish_inputrc @SYSCONFDIR@/fish_inputrc ~/.inputrc /etc/inputrc +for i in ~/.fish_inputrc @sysconfdir@/fish_inputrc ~/.inputrc /etc/inputrc if test -f $i set -xg INPUTRC $i break |