Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Set value of install path macros like DATADIR from the Makefile, not automatically by Autoconf using AC_DEFINE. That way we get correct expansion of ${prefix} and friends to their install-time value. This fixes a bug reported by James Vega.

Browse source 
darcs-hash:20060719144104-ac50b-05001b151a54bf893ff4c5a82c5f040529e27f57.gz
This commit is contained in:
axel 2006-07-20 00:41:04 +10:00
parent bef7fff383
commit 46c6f7880b
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile.in
View file

@ -36,10 +36,6 @@
CC := @CC@ CC := @CC@
INSTALL:=@INSTALL@ INSTALL:=@INSTALL@
CFLAGS:=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
LDFLAGS:= @LIBS@ @LDFLAGS@
# Installation directories # Installation directories
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
@ -48,6 +44,13 @@ bindir = @bindir@
mandir = @mandir@ mandir = @mandir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
docdir = @docdir@ docdir = @docdir@
localedir = @localedir@
prefix = @prefix@
CFLAGS:=@CFLAGS@ -DLOCALEDIR=L\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\"
CPPFLAGS=@CPPFLAGS@
LDFLAGS:= @LIBS@ @LDFLAGS@
#etc files to install #etc files to install
ETC_DIR_INSTALL = etc/fish_interactive.fish ETC_DIR_INSTALL = etc/fish_interactive.fish

13
configure.ac
View file

@ -212,17 +212,11 @@ fi
# it can make sure the fish installation directory is in the path # it can make sure the fish installation directory is in the path
# during startup. # during startup.
if [[ "$prefix" = NONE ]]; then if [[ "$prefix" = NONE ]]; then
AC_DEFINE_UNQUOTED( [PREFIX], L"/usr/local", [Installation directory])
AC_SUBST( PREFIX, /usr/local)
export prefix=/usr/local export prefix=/usr/local
AC_SUBST( prefix, /usr/local)
else else
AC_DEFINE_UNQUOTED( [PREFIX], L"$prefix", [Installation directory]) AC_SUBST( prefix, [$prefix])
AC_SUBST( PREFIX, [$prefix])
fi fi
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 the directory where the documentation files should be # Set up the directory where the documentation files should be
@ -237,8 +231,7 @@ fi
# Set up locale directory. This is where the .po files will be # Set up locale directory. This is where the .po files will be
# installed. # installed.
AC_DEFINE_UNQUOTED( [LOCALEDIR], "$(eval echo $datadir)/locale", [Locale directory]) AC_SUBST( [localedir], [$datadir/locale])
AC_SUBST( [LOCALEDIR], [$datadir/locale])
# See if Linux procfs is present. This is used to get extra # See if Linux procfs is present. This is used to get extra
# information about running processes. # information about running processes.