projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c95f0f8
)
* modules/configmake (Makefile.am): Add pkglibexecdir support, to
author
Eric Blake
<ebb9@byu.net>
Mon, 16 Oct 2006 17:43:14 +0000
(17:43 +0000)
committer
Eric Blake
<ebb9@byu.net>
Mon, 16 Oct 2006 17:43:14 +0000
(17:43 +0000)
match Automake 1.10a.
ChangeLog
patch
|
blob
|
history
modules/configmake
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 8393e8cb1054692490f7e8c4e2890abab93bc3cf..b7fe9db0ee901f2f0b547967751076f2666f47b4 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-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.
2006-10-14 Bruno Haible <bruno@clisp.org>
* modules/sigprocmask: New file.
diff --git
a/modules/configmake
b/modules/configmake
index a19d29bf0c24fa8b8e5c1d067d340910a4e1505f..b814ffdff53524eed775e316baa088984c717008 100644
(file)
--- a/
modules/configmake
+++ b/
modules/configmake
@@
-24,7
+24,7
@@
Makefile.am:
#
# Listed in the same order as the GNU makefile conventions.
# The Automake-defined pkg* macros are appended, in the order
#
# 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! */'; \
configmake.h: Makefile
rm -f $@-t $@
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@
-51,9
+51,10
@@
configmake.h: Makefile
echo '#define LOCALEDIR "$(localedir)"'; \
echo '#define MANDIR "$(mandir)"'; \
echo '#define MANEXT "$(manext)"'; \
echo '#define LOCALEDIR "$(localedir)"'; \
echo '#define MANDIR "$(mandir)"'; \
echo '#define MANEXT "$(manext)"'; \
- echo '#define PKGLIBDIR "$(pkglibdir)"'; \
- echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
echo '#define PKGDATADIR "$(pkgdatadir)"'; \
echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+ echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+ echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+ echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
} | sed '/""/d' > $@-t
mv $@-t $@
BUILT_SOURCES += configmake.h
} | sed '/""/d' > $@-t
mv $@-t $@
BUILT_SOURCES += configmake.h