00dani/stow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't duplicate stow.texi to manual.texi.

Browse source
This commit is contained in:
Adam Spiers 2011-11-28 23:17:50 +00:00
parent d672e3e6cf
commit aad96a0a44
3 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MANIFEST
View file

@ -11,9 +11,9 @@ COPYING
default-ignore-list default-ignore-list
doc/ChangeLog.OLD doc/ChangeLog.OLD
doc/manual.html doc/manual.html
doc/manual.pdf
doc/stow.8 doc/stow.8
doc/stow.info doc/stow.info
doc/stow.pdf
doc/stow.texi doc/stow.texi
doc/texinfo.tex doc/texinfo.tex
doc/version.texi doc/version.texi

2
MANIFEST.SKIP
View file

@ -76,7 +76,7 @@
^doc/\.dirstamp$ ^doc/\.dirstamp$
^doc/stamp-vti$ ^doc/stamp-vti$
^doc/manual.texi ^doc/manual.texi
^doc/stow.pdf ^doc/manual.pdf$
# Avoid test files # Avoid test files
^tmp-testing-trees ^tmp-testing-trees

24
Makefile.am
View file

@ -5,8 +5,9 @@ info_TEXINFOS = doc/stow.texi
dist_man_MANS = doc/stow.8 dist_man_MANS = doc/stow.8
dist_doc_DATA = \ dist_doc_DATA = \
README \ README \
doc/manual.html doc/manual.pdf \ doc/manual.html \
ChangeLog doc/ChangeLog.OLD ChangeLog doc/ChangeLog.OLD
doc_DATA = doc/manual.pdf
# Would be nice to include the split page HTML version of the manual # Would be nice to include the split page HTML version of the manual
# in the distribution, but automake doesn't support wildcards and I'm # in the distribution, but automake doesn't support wildcards and I'm
@ -77,6 +78,7 @@ $(TESTS_OUT):
CPAN_FILES = MANIFEST MANIFEST.SKIP Build.PL META.yml META.json CPAN_FILES = MANIFEST MANIFEST.SKIP Build.PL META.yml META.json
EXTRA_DIST = \ EXTRA_DIST = \
bin/stow.in bin/chkstow.in lib/Stow.pm.in \ bin/stow.in bin/chkstow.in lib/Stow.pm.in \
doc/stow.pdf \
$(TESTS) t/testutil.pm \ $(TESTS) t/testutil.pm \
$(TEXINFO_TEX) \ $(TEXINFO_TEX) \
$(DEFAULT_IGNORE_LIST) \ $(DEFAULT_IGNORE_LIST) \
@ -87,7 +89,7 @@ CLEANFILES = $(bin_SCRIPTS) $(dist_pm_DATA)
clean-local: clean-local:
-rm -rf $(TESTS_OUT) \ -rm -rf $(TESTS_OUT) \
bin/stow bin/chkstow doc/stow.8 ChangeLog \ bin/stow bin/chkstow doc/stow.8 ChangeLog \
doc/manual.* doc/manual.html doc/manual.pdf
# this is more explicit and reliable than the config file trick # this is more explicit and reliable than the config file trick
edit = sed -e 's|[@]PERL[@]|$(PERL)|g' \ edit = sed -e 's|[@]PERL[@]|$(PERL)|g' \
@ -115,22 +117,14 @@ lib/Stow.pm: lib/Stow.pm.in Makefile $(DEFAULT_IGNORE_LIST)
# generate manual.html and manual.pdf (which ultimately go somewhere # generate manual.html and manual.pdf (which ultimately go somewhere
# like /usr/share/doc/stow/) rather than stow.html and stow.pdf, to # like /usr/share/doc/stow/) rather than stow.html and stow.pdf, to
# make it obvious that these files contain the manual. So we have to # make it obvious that these files contain the manual. So we have to
# jump through a few extra hoops. We preserve timestamps to avoid any # jump through a few extra hoops.
# unnecessary rebuilds, since not everyone has texinfo installed. doc/manual.pdf: doc/stow.pdf
doc/manual.texi: doc/stow.texi doc/version.texi
[ -d doc ] || mkdir doc # required in vpath mode [ -d doc ] || mkdir doc # required in vpath mode
cp --preserve=timestamps $< $@ cp $< $@
doc/manual.pdf: doc/stow.pdf doc/version.texi doc/manual.html: doc/stow.texi
[ -d doc ] || mkdir doc # required in vpath mode
cp --preserve=timestamps $< $@
# It's easier to calculate the absolute path to $(srcdir) rather than
# the relative path to it from the doc/ build subdirectory.
doc/manual.html: doc/manual.texi
-rm -f $@ -rm -f $@
srcdir=$$( cd $(srcdir); pwd ); \ texi2html --P=$(srcdir) --output=$@ -expandinfo -menu -monolithic -verbose $<
cd doc && texi2html -I $$srcdir -expandinfo -menu -monolithic -verbose manual.texi
doc/stow.8: bin/stow Makefile doc/stow.8: bin/stow Makefile
[ -d doc ] || mkdir doc # required in vpath mode [ -d doc ] || mkdir doc # required in vpath mode