From 6682aa9caffbed12df8173280b845bfebe18b141 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Sat, 3 Dec 2011 01:30:08 +0000 Subject: Temporarily remove PDF from dist_doc_DATA due to automake issue. http://article.gmane.org/gmane.comp.sysutils.automake.general/13192 This means that it is still included in the distribution and installed, but is only automatically (re)built when making a new distribution - if stow.texi changes during development, it has to be rebuilt manually via 'make pdf'. --- MANIFEST | 1 - MANIFEST.SKIP | 1 + Makefile.am | 19 ++++++++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/MANIFEST b/MANIFEST index a9623e7..d6ce9da 100644 --- a/MANIFEST +++ b/MANIFEST @@ -17,7 +17,6 @@ doc/ChangeLog.OLD doc/stow.html doc/stow.8 doc/stow.info -doc/stow.pdf doc/stow.texi doc/texinfo.tex doc/version.texi diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index d85b741..cfbcaad 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -77,6 +77,7 @@ ^doc/stamp-vti$ ^doc/manual.texi$ ^doc/manual.pdf$ +^doc/stow.pdf$ ^doc/HOWTO-RELEASE$ ^doc/manual\.html\b diff --git a/Makefile.am b/Makefile.am index 30d3359..51502f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ info_TEXINFOS = doc/stow.texi dist_man_MANS = doc/stow.8 dist_doc_DATA = \ README \ - doc/stow.html doc/stow.pdf doc/version.texi \ + doc/stow.html doc/version.texi \ ChangeLog doc/ChangeLog.OLD # Would be nice to include the split page HTML version of the manual @@ -128,8 +128,8 @@ doc/stow.8: bin/stow Makefile # jump through a few extra hoops. install-data-hook: cd $(DESTDIR)$(docdir) && \ - mv -f stow.html manual.html && \ - mv -f stow.pdf manual.pdf + mv -f stow.html manual.html + cp $(srcdir)/doc/stow.pdf $(DESTDIR)$(docdir)/manual.pdf uninstall-hook: rm -f $(DESTDIR)$(docdir)/manual.{html,pdf} @@ -147,3 +147,16 @@ ChangeLog: doc/ChangeLog.OLD Makefile else \ echo "Not in a git repository; can't update ChangeLog."; \ fi + +# For website only; cannot currently be included in dist_doc_DATA +# because of: +# +# http://article.gmane.org/gmane.comp.sysutils.automake.general/13192 +# +# This means that it is still included in the distribution and +# installed, but is only automatically (re)built when making a new +# distribution - if stow.texi changes during development, it has to be +# rebuilt manually via 'make pdf'. +dist-hook: pdf + +pdf: doc/stow.pdf -- cgit v1.2.1