diff options
author | Owen Taylor <otaylor@redhat.com> | 2003-05-06 21:55:41 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2003-05-06 21:55:41 +0000 |
commit | 629a0e14248812e55e9245bad9e01d9bc6bd2d0a (patch) | |
tree | 4805be6ed3f1fab22e7f536861e8e4f896e63b2c /docs/faq | |
parent | 2e58122c793a66f6241ff4bfe74e8966a043eeb3 (diff) | |
download | gtk+-629a0e14248812e55e9245bad9e01d9bc6bd2d0a.tar.gz |
Patch from James Henstridge to update to automake-1.7 (#109542)
Tue May 6 16:50:52 2003 Owen Taylor <otaylor@redhat.com>
Patch from James Henstridge to update to automake-1.7
(#109542)
* autogen.sh: update to call newer tools.
* configure.in: various updates, to use M4 macros to put
variables that change each release at the top.
Use AC_HELP_STRING to format help strings.
Use AC_CONFIG_COMMANDS to generate gdkconfig.h.
* Makefile.am: require Automake 1.7. Remove gdk-2.0.pc and
gtk+-2.0.pc on uninstall. Pass --enable-gtk-doc to configure
during distcheck.
* docs/reference/*/Makefile.am: simplify to use the gtk-doc.make
makefile fragment.
* */Makefile.am: don't use STRIP_BEGIN/STRIP_END.
Use BUILT_SOURCES where appropriate.
Build generated files in builddir rather than srcdir.
Fix uninstall and distclean targets to satisfy distcheck.
===
* gdk/*/Makefile.am: Remove the hacks to get gdkenumtypes.h
built first, since we are now using BUILT_SOURCES.
* gdk/Makefile.am: Remove an outdated comment about gdk_headers.
* demos/gtk-demo/Makefile.am: Fix srcdir != buildd problem
with geninclude.pl.
* configure.in: Update versions to 2.3.0.
Diffstat (limited to 'docs/faq')
-rw-r--r-- | docs/faq/Makefile.am | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am index 9bb8c018d5..a774a8c58e 100644 --- a/docs/faq/Makefile.am +++ b/docs/faq/Makefile.am @@ -2,14 +2,18 @@ EXTRA_DIST = \ gtk-faq.sgml if HAVE_DOCBOOK -html: - (cd $(srcdir); \ - db2html gtk-faq.sgml; \ - test -d html && rm -r html; \ - mv gtk-faq html) +html: + if test -w $(srcdir); then \ + (cd $(srcdir); \ + db2html gtk-faq.sgml; \ + test -d html && rm -r html; \ + mv gtk-faq html); \ + fi pdf: - (cd $(srcdir); db2pdf gtk-faq.sgml) + if test -w $(srcdir); then \ + (cd $(srcdir); db2pdf gtk-faq.sgml); \ + fi dist-hook: html cp -Rp $(srcdir)/html $(distdir) @@ -26,7 +30,7 @@ pdf: dist-hook: echo "***" - echo "*** Warning: Tutorial not built" + echo "*** Warning: FAQ not built" echo "*** DISTRIBUTION IS INCOMPLETE" echo "***" endif |