From c92597f0e32daf8a9a25beaa260db805c8c92dab Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 27 Mar 2013 13:33:19 +0100 Subject: [PATCH] Documentation rebuilt if local.ent changes --- configure.ac | 10 +++++----- doc/Makefile.am | 8 +++++--- doc/local.ent.in | 3 --- doc/local0.ent.in | 2 ++ 4 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 doc/local.ent.in create mode 100644 doc/local0.ent.in diff --git a/configure.ac b/configure.ac index e30ed52..f37b77c 100644 --- a/configure.ac +++ b/configure.ac @@ -57,22 +57,22 @@ else fi AC_DEFINE_UNQUOTED([PAZPAR2_VERSION_SHA1], ["$sha"], [Git SHA1]) -AC_CONFIG_FILES([ +AC_OUTPUT([ Doxyfile Makefile src/Makefile test/Makefile js/Makefile doc/Makefile - doc/local.ent + doc/local0.ent doc/common/Makefile doc/common/print.dsl win/version.nsi +],[ + diff doc/local.ent doc/local0.ent >/dev/null 2>/dev/null \ + || cp doc/local0.ent doc/local.ent ]) -AC_OUTPUT - - echo \ "------------------------------------------------------------------------ diff --git a/doc/Makefile.am b/doc/Makefile.am index 7c8f0f5..f713e72 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -3,13 +3,13 @@ SUBDIRS = common SUFFIXES=.1 .5 .7 .8 .pdf .esp .xml -XMLFILES = book.xml manref.xml gpl-2.0.xml +XMLFILES = book.xml manref.xml gpl-2.0.xml local.ent MAINXML = $(srcdir)/book.xml XMLMAN = pazpar2.xml pazpar2_protocol.xml pazpar2_conf.xml -SUPPORTFILES = entities.ent local.ent.in +SUPPORTFILES = entities.ent MANFILES = pazpar2.8 pazpar2_protocol.7 pazpar2_conf.5 @@ -20,12 +20,14 @@ PNGFILES = doc_DATA = $(HTMLFILES) $(PNGFILES) man_MANS = $(MANFILES) -EXTRA_DIST = $(XMLFILES) $(XMLMAN) $(doc_DATA) $(man_MANS) +EXTRA_DIST = $(XMLFILES) $(XMLMAN) $(doc_DATA) $(man_MANS) $(SUPPORTFILES) $(HTMLFILES): $(XMLFILES) $(PNGFILES) rm -f *.html $(HTML_COMPILE) $(MAINXML) +$(MANFILES): local.ent + .xml.1: $(MAN_COMPILE) $< diff --git a/doc/local.ent.in b/doc/local.ent.in deleted file mode 100644 index 783c4a7..0000000 --- a/doc/local.ent.in +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/doc/local0.ent.in b/doc/local0.ent.in new file mode 100644 index 0000000..7e7401c --- /dev/null +++ b/doc/local0.ent.in @@ -0,0 +1,2 @@ + + -- 1.7.10.4