New version of the xdg fix. Unlike the previous version, this one should actually work.

darcs-hash:20061009212440-ac50b-10d1cdd7441335d033171f5b71a8a97f8a1d1dfb.gz
This commit is contained in:
axel 2006-10-10 07:24:40 +10:00
parent dafeac5c40
commit 194167da32
2 changed files with 5 additions and 6 deletions

View File

@ -49,9 +49,9 @@ prefix = @prefix@
optbindirs = @optbindirs@ optbindirs = @optbindirs@
PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
MACROS=-DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DHAVE_CONFIG_H MACROS=-DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\"
CFLAGS=@CFLAGS@ $(MACROS) CFLAGS=@CFLAGS@ $(MACROS)
CPPFLAGS=@CPPFLAGS@ -I. CPPFLAGS=@CPPFLAGS@
LDFLAGS= @LIBS@ @LDFLAGS@ LDFLAGS= @LIBS@ @LDFLAGS@

View File

@ -225,8 +225,7 @@ if test "$glibc" = yes; then
# fallback.h, in order to keep fish working on non-gnu platforms. # fallback.h, in order to keep fish working on non-gnu platforms.
# #
AC_DEFINE( _GNU_SOURCE, 1, [Macro to enable additional prototypes under Glibc]) CFLAGS="$CFLAGS -D_GNU_SOURCE=1 -D_ISO99_SOURCE=1"
AC_DEFINE( _ISOC99_SOURCE, 1, [Macro to enable additional prototypes under Glibc])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
@ -291,9 +290,9 @@ fi
AC_ARG_VAR( [docdir], [Documentation direcotry] ) AC_ARG_VAR( [docdir], [Documentation direcotry] )
if test -z $docdir; then if test -z $docdir; then
AC_SUBST(docdir, [$datadir/doc/fish] ) AC_SUBST(docdir, [$datadir/doc/fish] )
else else
AC_SUBST(docdir, [$docdir]) AC_SUBST(docdir, [$docdir])
fi 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