Don't use DEFS to define stuff. Use INCLUDES instead.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2108 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index c406deca4241ce467b671ab76ddf930b0bd6a103..463dedf0821130959af392f42d4ec2a2f980dc32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -417,6 +417,8 @@ CVS code -
        - New file imported from glib 2.4.7.  This is needed to detect
          glib 2.x on systems that may not have it installed. (DLR,
          suggested by Jordi)
+- src/Makefile.am:
+       - Don't use DEFS to define things. Use INCLUDES instead. (Jordi)
 
 GNU nano 1.3.4 - 2004.08.17
 - General:

diff --git a/configure.ac b/configure.ac
index 9f325a98aa4774159d10c3821e059481a008431f..3e33da0a3bdc538ebe32cec010ce97bf941e9384 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,9 @@
 
 AC_INIT([GNU nano], [1.3.4-cvs], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
+AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER([config.h:config.h.in])
+AC_CONFIG_HEADERS([config.h])
 
 AC_PREREQ(2.54)
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 5f945339b23fb286b0dea3475afbe4228aa1dcab..42a050a39c75990170daeb0ce54b3db913b12288 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,5 @@
-DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"
 localedir = $(datadir)/locale
-INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\"
+INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
 
 ACLOCAL_AMFLAGS = -I m4