Re: Documentation generation patch

[Tomasz Gajewski]

Marcus Brinkmann <address@hidden> writes:

> Prtability is not an issue, but still.  Can't you use $(builddir)
> here or what it is called?

Following your suggestion I've found $(srcdir) which contains what we
want here.

> Is TEXINPUTS a search path?  Can't this be passed on the command line,
> I'd prefer that over mangling the environment.

I've looked through the tex manpage and haven't found command line
option.

> At the very least you'd have to preserve the already existing value
> of it (ie, extending it rather than overwriting).

I agree - changed this.

New patch is below.

Regards
Tomasz Gajewski


Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/hurd/hurd-l4/doc/Makefile.am,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.am
--- doc/Makefile.am     22 Mar 2004 00:26:50 -0000      1.4
+++ doc/Makefile.am     18 Apr 2004 20:18:43 -0000
@@ -43,15 +43,15 @@ hurd-on-l4.dvi: ${eps_files} ${tex_files
 SUFFIXES = .ps .dvi .tex .eps .fig .pdf
  
 .tex.dvi:
-       $(LATEX) $< -o $@
+       TEXINPUTS="$(srcdir):$(TEXINPUTS)" $(LATEX) $< -o $@ ; \
        while egrep "^LaTeX Warning:.*Rerun to" \
-           `echo $< | sed -e 's/.tex$$/.log/'`; do \
+           `echo $< | sed -e 's/.*\///' -e 's/.tex$$/.log/'`; do \
          rm -f $(subst $<,.tex,.log); \
-         $(LATEX) $< -o $@; \
+         TEXINPUTS="$(srcdir):$(TEXINPUTS)" $(LATEX) $< -o $@; \
        done
  
 .dvi.ps:
-       $(DVIPS) $<
+       $(DVIPS) -o $@ $<
  
 .ps.pdf:
        $(PS2PDF) $<