diff options
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 316202d0..099a0fef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,9 +49,9 @@ prefix = @prefix@ optbindirs = @optbindirs@ 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) -CPPFLAGS=@CPPFLAGS@ -I. +CPPFLAGS=@CPPFLAGS@ LDFLAGS= @LIBS@ @LDFLAGS@ diff --git a/configure.ac b/configure.ac index ba21a90d..6af096a0 100644 --- a/configure.ac +++ b/configure.ac @@ -225,8 +225,7 @@ if test "$glibc" = yes; then # fallback.h, in order to keep fish working on non-gnu platforms. # - AC_DEFINE( _GNU_SOURCE, 1, [Macro to enable additional prototypes under Glibc]) - AC_DEFINE( _ISOC99_SOURCE, 1, [Macro to enable additional prototypes under Glibc]) + CFLAGS="$CFLAGS -D_GNU_SOURCE=1 -D_ISO99_SOURCE=1" else AC_MSG_RESULT(no) fi @@ -291,9 +290,9 @@ fi AC_ARG_VAR( [docdir], [Documentation direcotry] ) if test -z $docdir; then - AC_SUBST(docdir, [$datadir/doc/fish] ) + AC_SUBST(docdir, [$datadir/doc/fish] ) else - AC_SUBST(docdir, [$docdir]) + AC_SUBST(docdir, [$docdir]) fi # Set up locale directory. This is where the .po files will be |