diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 90b47f84..2d49994f 100644 --- a/configure.ac +++ b/configure.ac @@ -104,10 +104,6 @@ else AC_SUBST( PREFIX, [$prefix]) fi -AC_SUBST(fishdir,[/fish.d]) -AC_SUBST(fishfile,[/fish]) -AC_SUBST(fishinputfile,[/fish_inputrc]) - AC_ARG_VAR( [docdir], [Documentation direcotry] ) if test -z $docdir; then @@ -116,7 +112,9 @@ fi AC_DEFINE_UNQUOTED( DOCDIR, [L"$(eval echo $docdir)"], [Documentation directory] ) AC_DEFINE_UNQUOTED( SYSCONFDIR, [L"$(eval echo $sysconfdir)"], [System configuration directory] ) +AC_DEFINE_UNQUOTED( DATADIR, [L"$(eval echo $datadir)"], [System configuration directory] ) AC_SUBST( SYSCONFDIR, ["$(eval echo $sysconfdir)"] ) +AC_SUBST( DATADIR, ["$(eval echo $datadir)"] ) # Set up locale directory AC_DEFINE_UNQUOTED( [LOCALEDIR], "$(eval echo $datadir)/locale", [Locale directory]) @@ -235,7 +233,7 @@ fi # Check if we have ncurses, and use it rather than curses if possible. AC_SEARCH_LIBS( setupterm, [ncurses curses], [ AC_MSG_NOTICE([Found curses implementation])], [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] ) -AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile init/fish init/fish_interactive.fish init/fish_complete.fish seq]) +AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile etc/fish etc/fish_interactive.fish seq]) AC_OUTPUT echo "Now run 'make' and 'make install' to built and install fish." |