changeset 27196:835613c12d06

* modules/configmake (Makefile.am): Add pkglibexecdir support, to match Automake 1.10a.
author Eric Blake <ebb9@byu.net>
date Mon, 16 Oct 2006 17:43:14 +0000
parents d29433257548
children 23c4965d88ff
files ChangeLog modules/configmake
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Oct 16 13:59:29 2006 +0000
+++ b/ChangeLog	Mon Oct 16 17:43:14 2006 +0000
@@ -1,3 +1,8 @@
+2006-10-16  Eric Blake  <ebb9@byu.net>
+
+	* modules/configmake (Makefile.am): Add pkglibexecdir support, to
+	match Automake 1.10a.
+
 2006-10-14  Bruno Haible  <bruno@clisp.org>
 
 	* modules/sigprocmask: New file.
--- a/modules/configmake	Mon Oct 16 13:59:29 2006 +0000
+++ b/modules/configmake	Mon Oct 16 17:43:14 2006 +0000
@@ -24,7 +24,7 @@
 #
 # Listed in the same order as the GNU makefile conventions.
 # The Automake-defined pkg* macros are appended, in the order
-# listed in the Automake documentation.
+# listed in the Automake 1.10a+ documentation.
 configmake.h: Makefile
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -51,9 +51,10 @@
 	  echo '#define LOCALEDIR "$(localedir)"'; \
 	  echo '#define MANDIR "$(mandir)"'; \
 	  echo '#define MANEXT "$(manext)"'; \
-	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
 	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
-	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
 	} | sed '/""/d' > $@-t
 	mv $@-t $@
 BUILT_SOURCES += configmake.h