diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2014-01-15 16:18:12 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2014-01-15 23:50:42 +0800 |
| commit | bd313b0b3d6ea2eb3af532eace358d06d8f44f0d (patch) | |
| tree | dfedff9327c78999d1b82480298a5ebff8372838 | |
| parent | 568de7e8189fbf5c97987bfce9594fe404298ed1 (diff) | |
configure/Makefile: remove unused variables and unneeded declarations
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | configure.ac | 38 |
2 files changed, 0 insertions, 41 deletions
diff --git a/Makefile.in b/Makefile.in index 50b73522..c016d9f7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,7 +47,6 @@ mandir = @mandir@ sysconfdir = @sysconfdir@ docdir = @docdir@ localedir = @localedir@ -optbindirs = @optbindirs@ # # Various flags @@ -377,8 +376,6 @@ doc.h: $(HDR_FILES) -e "s,@docdir\@,$(docdir),g" \ -e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|g" \ -e "s,@prefix\@,$(prefix),g" \ - -e "s,@optbindirs\@,$(optbindirs),g" -#-e "s,@\@,$()," # diff --git a/configure.ac b/configure.ac index 5cc31af6..9eda25a6 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,6 @@ conf_arg=$@ # List of output variables produced by this configure script # -AC_SUBST(docdir) AC_SUBST(HAVE_GETTEXT) AC_SUBST(HAVE_DOXYGEN) AC_SUBST(LDFLAGS_FISH) @@ -30,9 +29,6 @@ AC_SUBST(LIBS_FISH_INDENT) AC_SUBST(LIBS_FISH_PAGER) AC_SUBST(LIBS_FISHD) AC_SUBST(LIBS_MIMEDB) -AC_SUBST(localedir) -AC_SUBST(optbindirs) -AC_SUBST(prefix) # @@ -382,40 +378,6 @@ esac # -# Set up PREFIX and related preprocessor symbols. Fish needs to know -# where it will be installed. One of the reasons for this is so that -# it can make sure the fish installation directory is in the path -# during startup. -# - -if [[ "$prefix" = NONE ]]; then - prefix=/usr/local -fi - - -# -# Set up the directory where the documentation files should be -# installed -# - -AC_ARG_VAR( [docdir], [Documentation directory] ) - -if test -z $docdir; then - docdir=$datadir/doc/fish -else - docdir=$docdir -fi - - -# -# Set up locale directory. This is where the .po files will be -# installed. -# - -localedir=$datadir/locale - - -# # See if Linux procfs is present. This is used to get extra # information about running processes. # |