projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Alter GNUmakefile to install into top directory.
[gnulib.git]
/
modules
/
configmake
diff --git
a/modules/configmake
b/modules/configmake
index
8090a33
..
a1169a9
100644
(file)
--- a/
modules/configmake
+++ b/
modules/configmake
@@
-23,8
+23,11
@@
Makefile.am:
# Another advantage is that 'make' output is shorter.
#
# Listed in the same order as the GNU makefile conventions.
# Another advantage is that 'make' output is shorter.
#
# Listed in the same order as the GNU makefile conventions.
+# The Automake-defined pkg* macros are appended, in the order
+# listed in the Automake 1.10a+ documentation.
configmake.h: Makefile
configmake.h: Makefile
- ( \
+ rm -f $@-t $@
+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
echo '#define PREFIX "$(prefix)"'; \
echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
echo '#define BINDIR "$(bindir)"'; \
echo '#define PREFIX "$(prefix)"'; \
echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
echo '#define BINDIR "$(bindir)"'; \
@@
-48,7
+51,11
@@
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)"'; \
- :) | sed '/""/d' >$@-t
+ 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
CLEANFILES += configmake.h configmake.h-t
mv $@-t $@
BUILT_SOURCES += configmake.h
CLEANFILES += configmake.h configmake.h-t
@@
-57,7
+64,7
@@
Include:
"configmake.h"
License:
"configmake.h"
License:
-LGPL
+LGPL
v2+
Maintainer:
all
Maintainer:
all