Re: [HACKERS] docs toolchain appears broke?

Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> writes:

> Larry Rosenman <ler(at)lerctr(dot)org> writes:
> > gmake[1]: Leaving directory `/home/ler/pg-dev/pgsql/doc/src/sgml'
> > cd sgml && tar -cf ../programmer.tar --exclude=Makefile
> > --exclude='*.sgml' --exclude=ref *.html -C `cd . && pwd`/graphics
> > catalogs.gif connections.gif
> > tar: can't add file catalogs.gif : No such file or directory
> > tar: can't add file connections.gif : No such file or directory
> > gmake: *** [programmer.tar] Error 1
>
> Kinda looks like Ian broke the compile-in-source-dir case while
> making the compile-in-separate-dir case work. Tut tut.

Yes. My apologies. This patch is one way to fix things.

Ian

Index: Makefile
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/doc/src/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 2001/03/25 08:32:24 1.17
+++ Makefile 2001/03/26 07:03:23
@@ -43,17 +43,20 @@
programmer.tar:
$(MAKE) -C sgml clean
$(MAKE) -C sgml programmer.html
- cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir) && pwd`/graphics catalogs.gif connections.gif
+ abssrcdir=`cd $(srcdir) && pwd`; \
+ cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C $$abssrcdir/graphics catalogs.gif connections.gif

tutorial.tar:
$(MAKE) -C sgml clean
$(MAKE) -C sgml tutorial.html
- cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir) && pwd`/graphics clientserver.gif
+ abssrcdir=`cd $(srcdir) && pwd`; \
+ cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C $$abssrcdir/graphics clientserver.gif

postgres.tar:
$(MAKE) -C sgml clean
$(MAKE) -C sgml postgres.html
- cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir) && pwd`/graphics catalogs.gif clientserver.gif connections.gif
+ abssrcdir=`cd $(srcdir) && pwd`; \
+ cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C $$abssrcdir/graphics catalogs.gif clientserver.gif connections.gif

man.tar:
$(MAKE) -C sgml man