Assume autoconf 2.60 or newer.

diff --git a/ChangeLog b/ChangeLog
index 061a1297fed70d8a68fcea643a31deb3a201da72..38a9504ccdb40b2fe5ec327854dcfd92aa82d089 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh: Require autoconf-2.60.
+
 2006-03-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]: Avoid warning when

diff --git a/autogen.sh b/autogen.sh
index 8a47198fdee57c5d3f102c8037a8666f798db831..4c17b6ece3b63cbd7e00acd9fac4f14863bc41f8 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 # Convenience script for regenerating all aclocal.m4, config.h.in, Makefile.in,
 # configure files with new versions of autoconf or automake.
 #
-# This script requires autoconf-2.58..2.59 and automake-1.8.2..1.9 in the PATH.
+# This script requires autoconf-2.60 and automake-1.8.2..1.9 in the PATH.
 
 # Copyright (C) 2003-2006 Free Software Foundation, Inc.
 #

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 3a9f5407aafbb4cee8f3c6041accc2ed511235a7..0a1b71fcd1b5516bdd06b1c5540faafe4f129576 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * configure.ac (docdir): If --docdir value was given, use that.
+       (mandir): Remove customization.
+
 2006-05-15  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac (DLL_VARIABLE): Define as empty on mingw, like on

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 630c382bfa0c26a33223d80131f3f34a0da66a1f..796bd2e63b79281d7e12485a74c259a76403fe38 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -26,9 +26,7 @@ AM_INIT_AUTOMAKE(gettext-runtime, $VERSION_NUMBER)
 AM_CONFIG_HEADER(config.h)
 
 dnl Installation directories.
-AC_SUBST([docdir], ['${datadir}/doc/gettext'])
-dnl Prefer modern Filesystem Hierarchy Standard over antiquated GNU standards.
-test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
+test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
 
 dnl Checks for programs.
 AC_PROG_CC

diff --git a/gettext-runtime/intl-csharp/ChangeLog b/gettext-runtime/intl-csharp/ChangeLog
index 32ac31030f2be2a7831562b162cc22de56404142..c9b95ef8deaa464d1e3a16857d666ef834a1560e 100644 (file)
--- a/gettext-runtime/intl-csharp/ChangeLog
+++ b/gettext-runtime/intl-csharp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (docdir, htmldir): Remove variables.
+
 2006-04-17  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs).

diff --git a/gettext-runtime/intl-csharp/Makefile.am b/gettext-runtime/intl-csharp/Makefile.am
index 5c40f93844d85712871415408a71c34e28059c7b..303c76fffac64e3fa61fcc3743a5ae0b4b5cdcb0 100644 (file)
--- a/gettext-runtime/intl-csharp/Makefile.am
+++ b/gettext-runtime/intl-csharp/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/intl-csharp subdirectory of GNU gettext
-## Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+## Copyright (C) 2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -26,6 +26,9 @@ RM = rm -f
 docdir = @docdir@
 htmldir = $(docdir)
 
+docdir = @docdir@
+htmldir = $(docdir)
+
 CSHARPCOMP = $(SHELL) ../lib/csharpcomp.sh
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 

diff --git a/gettext-runtime/intl-java/ChangeLog b/gettext-runtime/intl-java/ChangeLog
index 7beeecfba51d4f44a2184116e3aeff0f015c3810..727b07e7c6602504e07264a6dd6d75464e1c94ce 100644 (file)
--- a/gettext-runtime/intl-java/ChangeLog
+++ b/gettext-runtime/intl-java/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (docdir, htmldir): Remove variables.
+
 2006-04-17  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs).

diff --git a/gettext-runtime/intl-java/Makefile.am b/gettext-runtime/intl-java/Makefile.am
index 94d2c55c992d51689f577fc8821ea1322600c626..86a2bf759b66f4181e5c827c6a786dd97349fc84 100644 (file)
--- a/gettext-runtime/intl-java/Makefile.am
+++ b/gettext-runtime/intl-java/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/intl-java subdirectory of GNU gettext
-## Copyright (C) 2001-2003 Free Software Foundation, Inc.
+## Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -24,8 +24,6 @@ CLEANFILES =
 RM = rm -f
 
 jardir = $(datadir)/gettext
-docdir = @docdir@
-htmldir = $(docdir)
 
 JAR = @JAR@
 JAVACOMP = $(SHELL) ../lib/javacomp.sh

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index ae0235f74004c7a4e52d67e837481e5e3acd64d5..45f5aa60e77c67bebf07f35c74286d4b44e7877a 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (docdir, dvidir, psdir, pdfdir, htmldir): Remove
+       variables.
+
 2006-05-24  Bruno Haible  <bruno@clisp.org>
 
        * printf-args.c (printf_fetchargs): Turn NULL pointers for

diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
index 409c04e0a142cadfc1bef17709ebfe7dbc11dcab..68db9535c6c277b0d655219c2a2361ac681bbe39 100644 (file)
--- a/gettext-runtime/libasprintf/Makefile.am
+++ b/gettext-runtime/libasprintf/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/libasprintf subdirectory of GNU gettext
-## Copyright (C) 2002-2005 Free Software Foundation, Inc.
+## Copyright (C) 2002-2006 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU Library General Public License as published
@@ -87,12 +87,6 @@ clean-local:
 
 # Documentation.
 
-docdir = $(datadir)/doc/@PACKAGE@
-dvidir = $(docdir)
-psdir = $(docdir)
-pdfdir = $(docdir)
-htmldir = $(docdir)
-
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
 MAKEINFOFLAGS = --no-split
 

diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog
index f9f1482ef4b7bece0f0c2f9095c6964d93563fcd..2b23bb9dc04b19f754b4987eb8430115f69a1691 100644 (file)
--- a/gettext-runtime/man/ChangeLog
+++ b/gettext-runtime/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (mandir, docdir, htmldir, localedir): Remove variables.
+
 2006-04-17  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs).

diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am
index 6f226141573b8ec0a7ae48e8a1a22543284ee8d3..8b2d8c4c0f0b15052a9ad8526aad662cf7e86fac 100644 (file)
--- a/gettext-runtime/man/Makefile.am
+++ b/gettext-runtime/man/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/man subdirectory of GNU gettext
-## Copyright (C) 2001-2003 Free Software Foundation, Inc.
+## Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@
 ## Process this file with automake to produce Makefile.in.
 
 VERSION = @VERSION@
-mandir = @mandir@
-docdir = @docdir@
-htmldir = $(docdir)
-
-localedir = $(datadir)/locale
 
 AUTOMAKE_OPTIONS = 1.2 gnits
 EXTRA_DIST =

diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog
index 019d7b121fa9f39ec2804aa2b9201c73337d989b..7ddf4a75c6e9d525a38a8625c08b685e29cef937 100644 (file)
--- a/gettext-runtime/src/ChangeLog
+++ b/gettext-runtime/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (localedir): Remove variable.
+
 2006-04-02  Bruno Haible  <bruno@clisp.org>
 
        * envsubst.c: Include propername.h.

diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am
index 54a98c9b2dafa3d303b5a40cfb450d6d0075f6c3..eb95593a4cc61276b7e9fa110955ab5b6859d629 100644 (file)
--- a/gettext-runtime/src/Makefile.am
+++ b/gettext-runtime/src/Makefile.am
@@ -25,8 +25,6 @@ RM = rm -f
 
 bin_PROGRAMS = gettext ngettext envsubst
 
-localedir = $(datadir)/locale
-
 AM_CPPFLAGS = \
   -I. -I$(srcdir) \
   -I.. \

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index f80f713961025926139d476d45f84879f5dcf1ea..90991b771f409fadcfb768ebf48b24a7fbc5be76 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * configure.ac (localedir): Remove variable.
+       (docdir): If --docdir value was given, use that.
+       (mandir): Remove customization.
+
 2006-05-15  Bruno Haible  <bruno@clisp.org>
 
        * woe32dll/export.h: Renamed from cygwin/export.h.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 5900f38bfa04d4d8e3b7b873400f1fd387014059..b524b0b86040ea75db0afe71a995f0aa3797d8ee 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -26,10 +26,7 @@ AM_INIT_AUTOMAKE(gettext-tools, $VERSION_NUMBER)
 AM_CONFIG_HEADER(config.h)
 
 dnl Installation directories.
-AC_SUBST([localedir], ['${datadir}/locale'])
-AC_SUBST([docdir], ['${datadir}/doc/gettext'])
-dnl Prefer modern Filesystem Hierarchy Standard over antiquated GNU standards.
-test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
+test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
 
 dnl Checks for programs.
 AC_PROG_CC

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 791be989de12ffa4c1d21de4144cbdd286e904dd..8fa010ccbdc0d611a413ccf88e2a2320d40a953c 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (docdir, dvidir, psdir, pdfdir, htmldir): Remove
+       variables.
+
 2006-06-18  Bruno Haible  <bruno@clisp.org>
 
        * gettext.texi (configure.in): Document where to put AC_GNU_SOURCE.

diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index 6f81e2c770fbf03e297cf79bae66046bbc6618fd..33c5831abea69ece05ed3dc30840b80b15140809 100644 (file)
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -17,12 +17,6 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-docdir = @docdir@
-dvidir = $(docdir)
-psdir = $(docdir)
-pdfdir = $(docdir)
-htmldir = $(docdir)
-
 AUTOMAKE_OPTIONS = 1.2 gnits
 EXTRA_DIST =
 MOSTLYCLEANFILES =

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 588454f6c7982bc662b1a5dd8667ada90a10dfe5..81a9ea0cd1fbd951002abeb59eda57d72a7f9418 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (docdir): Remove variable.
+       * po/Makefile.am (localedir): Remove variable.
+
 2006-06-04  Bruno Haible  <bruno@clisp.org>
 
        * hello-c/{autoclean.sh,m4/Makefile.am}: Replace inttypes.m4 with

diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index 885740815a7e13e06890f1d816496bded8e772fe..d5bc3103752714b5c34a9072eaa5c2ae4c0ff133 100644 (file)
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -21,7 +21,6 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 SUBDIRS = po
 EXTRA_DIST =
 
-docdir = @docdir@
 examplesdir = $(docdir)/examples
 
 examples_DATA = installpaths

diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am
index b305ad1f0ff2e0d59e149e62dead70f663a7c8f4..d43b217aca581cb08b6e87e4dd1484a774f4b2f3 100644 (file)
--- a/gettext-tools/examples/po/Makefile.am
+++ b/gettext-tools/examples/po/Makefile.am
@@ -121,8 +121,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-localedir = $(datadir)/locale
-
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 08fee7aa012858222226ffc41d768f1a5dd345a4..1862963a163a8981f6ab5df27f4bede0b7e0f256 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (docdir): Remove variable.
+
 2006-06-21  Bruno Haible  <bruno@clisp.org>
 
        Avoid warnings from recent versions of mcs.

diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am
index 5b725f479351e41066031834f538ac9d5cea9a54..75370e6fc1ce3da42c3b7d978a22897354fcd0b6 100644 (file)
--- a/gettext-tools/lib/Makefile.am
+++ b/gettext-tools/lib/Makefile.am
@@ -153,7 +153,6 @@ EXTRA_DIST += javaversion.java
 
 # Files installed for the examples.
 
-docdir = @docdir@
 examplesbuildauxdir = $(docdir)/examples/build-aux
 examplesbuildaux_DATA = \
   javacomp.sh.in javaexec.sh.in \

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index bfa0349ab13ae6667f410f9d85a4e7ed089017fc..993188ca57998bdc76c05408c0c3c37ccf0422eb 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (docdir): Remove variable.
+
 2006-06-17  Bruno Haible  <bruno@clisp.org>
 
        * setenv.m4 (gl_PREREQ_SETENV, gl_PREREQ_UNSETENV): Remove test

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index 7e3ec75f0dd5b0c1d305fee018fface71c453a47..13b675e4f30bea656a0e6904427b0d57c3eb7b3c 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -38,7 +38,6 @@ aclocal_DATA = \
 
 # Files installed for the examples.
 
-docdir = @docdir@
 examplesbuildauxdir = $(docdir)/examples/build-aux
 examplesbuildaux_DATA = \
   gcj.m4 javacomp.m4 javaexec.m4 \

diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog
index 25707298a80a8de3cf0ae9b5ddc383cb9905e795..25196a76ce9363a12ec6c424228abd77c4cb158d 100644 (file)
--- a/gettext-tools/man/ChangeLog
+++ b/gettext-tools/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (mandir, docdir, htmldir, localedir): Remove variables.
+
 2006-04-17  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs).

diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am
index 412f903083406bf6eb944b641ab313421d172fed..93d45252d1d153dfd315d6e444b45394ad455544 100644 (file)
--- a/gettext-tools/man/Makefile.am
+++ b/gettext-tools/man/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/man subdirectory of GNU gettext
-## Copyright (C) 2001-2003 Free Software Foundation, Inc.
+## Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -18,11 +18,6 @@
 ## Process this file with automake to produce Makefile.in.
 
 VERSION = @VERSION@
-mandir = @mandir@
-docdir = @docdir@
-htmldir = $(docdir)
-
-localedir = $(datadir)/locale
 
 AUTOMAKE_OPTIONS = 1.2 gnits
 EXTRA_DIST =

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 2df2f26825be01a6439882479686497899d181e3..fa84b3dba28f83967303672f9f501fa7e6c97e2d 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (localedir): Remove variable.
+
 2006-06-21  Bruno Haible  <bruno@clisp.org>
 
        * x-sh.c (read_word): Recognize the Bash process substitution syntax.

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index bf631ffd4c6a184fba5dd958e37374c5b578bc18..f1f90420c02e067c8b20b71f401976ec8870060b 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -57,7 +57,6 @@ x-tcl.h x-perl.h x-php.h x-stringtable.h x-rst.h x-glade.h
 
 EXTRA_DIST += FILES project-id ChangeLog.0
 
-localedir = $(datadir)/locale
 aliaspath = $(localedir)
 jardir = $(datadir)/gettext
 pkgdatadir = $(datadir)/gettext

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 2b79cad12ac32c4eedd6748c539caa8b622ea396..883ff1602afca9f1063bcd2504636a936a57a6dd 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Bruno Haible  <bruno@clisp.org>
+
+       Assume autoconf >= 2.60.
+       * Makefile.am (localedir): Remove variable.
+
 2006-06-21  Bruno Haible  <bruno@clisp.org>
 
        * xgettext-sh-5: New file.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 31aeb1fb8b38766242d2fe857bce901c803e3287..5344b174a5ea85ba9c6736aa05512552b100ab14 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -178,7 +178,6 @@ xg-c-1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c
          $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c
 
 # Three auxiliary programs used by the tests.
-localedir = $(datadir)/locale
 AM_CPPFLAGS = \
   -I.. \
   -I../lib -I$(top_srcdir)/lib \