From d7b632560ce9ea1cd1dbad55bd3ca09e9452cb6e Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Thu, 18 Nov 2004 00:05:14 +0000 Subject: [PATCH] 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 --- ChangeLog | 2 ++ configure.ac | 3 ++- src/Makefile.am | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c406deca..463dedf0 100644 --- 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 9f325a98..3e33da0a 100644 --- 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 5f945339..42a050a3 100644 --- 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 -- 2.39.5