CVSROOT: /cvsroot/groff
Module name: groff
Branch:
Changes by: Werner LEMBERG <[EMAIL PROTECTED]> 05/04/28 05:52:48
Modified files:
. : ChangeLog
doc : Makefile.sub
Log message:
Correct `gnu.eps' handling for build from distribution tarball, with
separate source and build directories.
* doc/Makefile.sub: (examples.stamp): New target; forces copy of
grnexmpl.g, groff.css and gnu.eps from source to build directory;
generate gnu.eps from gnu.xpm if required; touch examples.stamp.
(prepare_examples): Make it depend on examples.stamp.
(CLEANADD): Add examples.stamp.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.814&tr2=1.815&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/Makefile.sub.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.814 groff/ChangeLog:1.815
--- groff/ChangeLog:1.814 Wed Apr 27 20:52:33 2005
+++ groff/ChangeLog Thu Apr 28 05:52:47 2005
@@ -1,3 +1,14 @@
+2005-04-28 Keith Marshall <[EMAIL PROTECTED]>
+
+ Correct `gnu.eps' handling for build from distribution tarball, with
+ separate source and build directories.
+
+ * doc/Makefile.sub: (examples.stamp): New target; forces copy of
+ grnexmpl.g, groff.css and gnu.eps from source to build directory;
+ generate gnu.eps from gnu.xpm if required; touch examples.stamp.
+ (prepare_examples): Make it depend on examples.stamp.
+ (CLEANADD): Add examples.stamp.
+
2005-04-27 Werner LEMBERG <[EMAIL PROTECTED]>
Implement the rule
Index: groff/doc/Makefile.sub
diff -u groff/doc/Makefile.sub:1.17 groff/doc/Makefile.sub:1.18
--- groff/doc/Makefile.sub:1.17 Fri Mar 18 06:45:21 2005
+++ groff/doc/Makefile.sub Thu Apr 28 05:52:48 2005
@@ -95,7 +95,8 @@
$(HTMLDOCFILESALL) \
groff.aux groff.cp* groff.dvi groff.es* groff.fn* groff.html groff.ky* \
groff.log groff.ma* groff.op* groff.pdf groff.pg* groff.ps groff.rq* \
- groff.st* groff.toc groff.tp groff.vr*
+ groff.st* groff.toc groff.tp groff.vr* \
+ examples.stamp
CLEANDIRADD=\
$(imagedir)
@@ -126,9 +127,19 @@
html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
-prepare_examples: grnexmpl.g groff.css
+prepare_examples: examples.stamp
+
+examples.stamp: grnexmpl.g groff.css gnu.eps
test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g .
test -f groff.css || cp $(srcdir)/groff.css .
+ if test ! -f gnu.eps; then \
+ if test -f $(srcdir)/gnu.eps; then \
+ cp $(srcdir)/gnu.eps .; \
+ elif test -f $(top_builddir)/contrib/pdfmark/gnu.eps; then \
+ cp $(top_builddir)/contrib/pdfmark/gnu.eps .; \
+ fi; \
+ fi
+ echo timestamp > $@
groff: groff.texinfo
$(MAKEINFO) --enable-encoding -I$(srcdir) $(srcdir)/groff.texinfo
@@ -136,6 +147,7 @@
gnu.eps: gnu.xpm
xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | \
$(pnmtops_nosetpage) -noturn -rle >$@
+
gnu.png: gnu.xpm
xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtopng >$@
_______________________________________________
Groff-commit mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/groff-commit
