From 589870c9d3f74288255c1bb61ec532420ab51c27 Mon Sep 17 00:00:00 2001
From: Werner LEMBERG <wl@gnu.org>
Date: Thu, 28 Apr 2005 05:52:48 +0000
Subject: [PATCH] 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.
---
 ChangeLog        | 11 +++++++++++
 doc/Makefile.sub | 16 ++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0403ad07..786a4803 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-04-28  Keith Marshall  <keith.d.marshall@ntlworld.com>
+
+	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  <wl@gnu.org>
 
 	Implement the rule
diff --git a/doc/Makefile.sub b/doc/Makefile.sub
index f7e85b08..3495d56b 100644
--- a/doc/Makefile.sub
+++ b/doc/Makefile.sub
@@ -95,7 +95,8 @@ CLEANADD=\
   $(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 @@ all: groff $(PROCESSEDDOCFILES) prepare_examples \
 
 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 @@ groff: groff.texinfo
 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 >$@
 
-- 
2.11.4.GIT