From 209a8e656f559e0a515cad85569243387480d7dd Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Fri, 8 Oct 2010 11:52:59 +0000 Subject: Fix substitution of PKGDATA in man pages. --- doc/Makefile.am | 18 ++++++++++++------ doc/plpprintd.man.in | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 8e2ad66..db06092 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -8,13 +8,19 @@ if BUILD_PLPFUSE man_MANS += plpfuse.8 endif -%.1: %.man - MANDATE=`grep CHECKIN $< | $(AWK) '{print $$4}'` ; \ - $(SED) -e "s%@MANDATE@%$$MANDATE%g" $< > $@ +edit = sed \ + -e 's%@MANDATE@%'`grep CHECKIN $< | $(AWK) '{print $$4}'`'%g' \ + -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' -%.8: %.man - MANDATE=`grep CHECKIN $< | $(AWK) '{print $$4}'` ; \ - $(SED) -e "s%@MANDATE@%$$MANDATE%g" $< > $@ +%.1: %.man Makefile + rm -f $@ $@.tmp + $(edit) '$(srcdir)/$<' >$@.tmp + mv $@.tmp $@ + +%.8: %.man Makefile + rm -f $@ $@.tmp + $(edit) '$(srcdir)/$<' >$@.tmp + mv $@.tmp $@ distclean-local: rm -f *.1 *.8 diff --git a/doc/plpprintd.man.in b/doc/plpprintd.man.in index 57ef504..6243874 100644 --- a/doc/plpprintd.man.in +++ b/doc/plpprintd.man.in @@ -63,10 +63,10 @@ in /etc/services. If it is not found there, a builtin value of @DPORT@ is used. .SH FILES .TP -@PKGDATA@/prolog.ps +@pkgdatadir@/prolog.ps contains the Postscript(\*R) dictionary, needed for printing the jobs. .TP -@PKGDATA@/fontmap +@pkgdatadir@/fontmap specifies the font mapping to be used. This file is used to convert the Psion's font names into valid Postscript(\*R) font names. Its format is described at the beginning of it. If a Psion font name is received which -- cgit v1.2.3