diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | gnome-doc-utils.m4 | 17 | ||||
| -rw-r--r-- | test/testdoc1/Makefile.am | 3 |
4 files changed, 27 insertions, 8 deletions
@@ -1,3 +1,10 @@ +2004-03-23 Shaun McCance <shaunm@gnome.org> + + * Makefile.am: + * gnome-doc-utils.m4: + * test/testdoc1/Makefile.am: + - Somewhat more intelligent use of gnome-doc-utils.make + 2004-03-19 Shaun McCance <shaunm@gnome.org> * Makefile.am diff --git a/Makefile.am b/Makefile.am index e53a55f..ce990bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,17 @@ SUBDIRS = doc po xslt -aclocaldir = $(datadir)/aclocal/gnome-doc-utils -aclocal_DATA = gnome-doc-utils.m4 gnome-doc-utils.make +aclocaldir = $(datadir)/aclocal +aclocal_DATA = gnome-doc-utils.m4 + +sharedir = $(datadir)/gnome-doc-utils +share_DATA = gnome-doc-utils.make pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnome-doc-utils.pc EXTRA_DIST = \ $(aclocal_DATA) \ + $(share_DATA) \ $(pkgconfig_DATA) \ intltool-extract.in \ intltool-merge.in \ diff --git a/gnome-doc-utils.m4 b/gnome-doc-utils.m4 index 18c40ce..73a01f0 100644 --- a/gnome-doc-utils.m4 +++ b/gnome-doc-utils.m4 @@ -17,10 +17,15 @@ AC_SUBST(OMF_DIR) GNOME_DOC_RULE='' AC_SUBST(GNOME_DOC_RULE) -#AC_OUTPUT_COMMANDS([ -#mkdir -p gnome-doc.cache -#if ! cmp -s gnome-doc.cache/gnome-doc-utils.make ${ac_aux_dir}/gnome-doc-utils.make; then -# cp ${ac_aux_dir}/gnome-doc-utils.make . -#fi -#]) +AC_OUTPUT_COMMANDS([ +gdumk=`pkg-config --variable prefix gnome-doc-utils`/share/gnome-doc-utils/gnome-doc-utils.make +if ! test -f gnome-doc-utils.m4; then + if ! cmp -s $gdumk gnome-doc-utils.make; then + cp $gdumk . + fi +fi +if ! grep -q 'gnome-doc-utils\.make' Makefile.am; then + echo gnome-doc-utils.make should be added to EXTRA_DIST in Makefile.am +fi +]) ]) diff --git a/test/testdoc1/Makefile.am b/test/testdoc1/Makefile.am index 15831f8..3e7fc3e 100644 --- a/test/testdoc1/Makefile.am +++ b/test/testdoc1/Makefile.am @@ -1 +1,4 @@ SUBDIRS = help + +EXTRA_DIST = \ + gnome-doc-utils.make
\ No newline at end of file |