diff options
| -rw-r--r-- | doc/gph/Makefile.am | 17 | ||||
| -rwxr-xr-x | scripts/mkdiff | 8 |
2 files changed, 14 insertions, 11 deletions
diff --git a/doc/gph/Makefile.am b/doc/gph/Makefile.am index 87e4d9fc1..732c3e3e6 100644 --- a/doc/gph/Makefile.am +++ b/doc/gph/Makefile.am @@ -1,35 +1,38 @@ # GPH - GNU Privacy Handbook PARTS = manual.sgml c1.sgml c2.sgml c3.sgml c4.sgml c5.sgml c6.sgml c7.sgml \ - signatures.fig + signatures.fig signatures.jpg.asc EXTRA_DIST = $(PARTS) index.html #BUILT_SOURCES = index.html -dummy: +all-local: ./signatures.jpg -index.html: $(PARTS) ./signatures.jpg +./signatures.jpg: $(srcdir)/signatures.jpg.asc + ../../g10/gpg --yes --dearmor \ + -o ./signatures.jpg $(srcdir)/signatures.jpg.asc + test -d manual && cp ./signatures.jpg ./manual/signatures.jpg + + +index.html: $(PARTS) @set -e; \ for i in $(PARTS); do \ [ -f $$i ] || cat /dev/null $(srcdir)/$$i >./$$i ; \ done db2html manual.sgml - cp signatures.jpg manual/signatures.jpg echo '<html><body>' >index.html echo '<ul>' >>index.html echo '<li><a href="manual/book1.html">GnuPG User Manual</a>' >>index.html echo '</ul>' >>index.html echo '</body></html>' >>index.html -rm -r manual.junk + -rm manual/signatures.jpg (cd manual; rm -r stylesheet-images; ls | grep -v distfiles >distfiles) -signatures.jpg: $(srcdir)/signatures.fig - fig2dev -L jpeg $(srcdir)/signatures.fig signatures.jpg dist-hook: index.html - %.dvi: %.sgml db2dvi $< diff --git a/scripts/mkdiff b/scripts/mkdiff index 4f7bfc77a..6fad6c188 100755 --- a/scripts/mkdiff +++ b/scripts/mkdiff @@ -9,14 +9,14 @@ pack="$1" set -e -curr_ver=$(ls $pack-*.tar.gz 2>/dev/null | sort -r -t '.' -n +0.4 -1 +1 -2 +2 \ - | head -1 | sed -e 's/'$pack'-\(.*\).tar.gz/\1/' ) +curr_ver=$(ls $pack-*.tar.gz 2>/dev/null | sed "s/^$pack-\(.*\)\.tar\.gz/\1/"\ + | sort -r -t '.' -n +0 -1 +1 -2 +2 | head -1 ) if [ ! -f $pack-$curr_ver.tar.gz ]; then echo "mkdiff: no current version of package $pack found" >&2 exit 1 fi -prev_ver=$(ls $pack-*.tar.gz 2>/dev/null | sort -r -t '.' -n +0.4 -1 +1 -2 +2 \ - | head -2 | tail -1 | sed -e 's/'$pack'-\(.*\).tar.gz/\1/' ) +prev_ver=$(ls $pack-*.tar.gz 2>/dev/null | sed "s/^$pack-\(.*\)\.tar\.gz/\1/"\ + | sort -r -t '.' -n +0 -1 +1 -2 +2 | head -2 | tail -1 ) if [ "$prev_ver" = "$curr_ver" ]; then echo "mkdiff: no previous version of package $pack found" >&2 exit 1 |