Patch for building docs in a different directory

Started by Ian Lance Taylorover 25 years ago2 messagespatches
Jump to latest
#1Ian Lance Taylor
ian@airs.com

I normally build in a directory other than the source directory. When
I tried to build the documentation that way, it failed. This patch,
against today's CVS sources, fixes the problem.

Ian

Index: src/Makefile
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/doc/src/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- src/Makefile	2001/02/17 16:47:57	1.16
+++ src/Makefile	2001/03/24 22:05:27
@@ -43,17 +43,17 @@
 programmer.tar:
 	$(MAKE) -C sgml clean
 	$(MAKE) -C sgml programmer.html
-	cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C ../graphics catalogs.gif connections.gif
+	cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir); /bin/pwd`/graphics catalogs.gif connections.gif
 tutorial.tar:
 	$(MAKE) -C sgml clean
 	$(MAKE) -C sgml tutorial.html
-	cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C ../graphics clientserver.gif
+	cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir); /bin/pwd`/graphics clientserver.gif
 postgres.tar:
 	$(MAKE) -C sgml clean
 	$(MAKE) -C sgml postgres.html
-	cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C ../graphics catalogs.gif clientserver.gif connections.gif
+	cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir); /bin/pwd`/graphics catalogs.gif clientserver.gif connections.gif
 man.tar:
 	$(MAKE) -C sgml man
Index: src/sgml/Makefile
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/doc/src/sgml/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- src/sgml/Makefile	2001/03/10 16:05:35	1.34
+++ src/sgml/Makefile	2001/03/24 22:05:27
@@ -26,7 +26,7 @@
 ifndef JADE
 JADE = jade
 endif
-SGMLINCLUDE = -D ref -D ../graphics
+SGMLINCLUDE = -D $(srcdir) -D $(srcdir)/ref -D $(srcdir)/../graphics

ifndef NSGMLS
NSGMLS = nsgmls

#2Peter Eisentraut
peter_e@gmx.net
In reply to: Ian Lance Taylor (#1)
Re: Patch for building docs in a different directory

Ian Lance Taylor writes:

I normally build in a directory other than the source directory. When
I tried to build the documentation that way, it failed. This patch,
against today's CVS sources, fixes the problem.

Done

Ian

Index: src/Makefile
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/doc/src/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- src/Makefile	2001/02/17 16:47:57	1.16
+++ src/Makefile	2001/03/24 22:05:27
@@ -43,17 +43,17 @@
programmer.tar:
$(MAKE) -C sgml clean
$(MAKE) -C sgml programmer.html
-	cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C ../graphics catalogs.gif connections.gif
+	cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir); /bin/pwd`/graphics catalogs.gif connections.gif

`cd $(srcdir) && pwd` would be the more conservative approach.

--
Peter Eisentraut peter_e@gmx.net http://yi.org/peter-e/