Another tiny patch, hopefully trivial to approve:
First, the unportable LN_S use I already noted, by testing on whether
srcdir is relative or absolute.  I don't like using abs_srcdir if I can
avoid it, as it prevents moving trees around.

Then, texi2html outputs into the current directory over here, so I made
the final `mv' cope with that, under the assumptions that texi2html has
not been consistent in this all the time (is this so?).  Also, fix
include path for VPATH builds.

OK for HEAD, branch-2-0?

Cheers,
Ralf

        * Makefile.maint (web-manual): Fix $(LN_S) use for absolute
        or relative $(srcdir).  Fix creating the manual for VPATH build.

Index: Makefile.maint
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.maint,v
retrieving revision 1.12
diff -u -r1.12 Makefile.maint
--- Makefile.maint      23 Aug 2005 01:49:36 -0000      1.12
+++ Makefile.maint      23 Aug 2005 11:33:20 -0000
@@ -238,7 +238,9 @@
 
 .PHONY: web-manual
 web-manual:
-       @$(LN_S) $(srcdir)/doc/libtool.texi doc/manual.texi
-       $(TEXI2HTML) -I doc -monolithic -number -verbose doc/manual.texi
-       @mv doc/manual.html manual.html
+       @rm -f doc/manual.texi manual.html
+       @case "$(srcdir)" in [\\/]*) pre= ;; *) pre=../ ;; esac; \
+       cd doc && $(LN_S) $$pre$(srcdir)/doc/libtool.texi manual.texi
+       $(TEXI2HTML) -I doc -I $(srcdir)/doc -monolithic -number -verbose 
doc/manual.texi
+       @test -f manual.html || mv doc/manual.html manual.html
        @rm -f doc/manual.texi


Reply via email to