Re: bug in Doc/Makefile when configure --srcdir used (or implied)

[Scott Blachowicz <scott@xxxxxxxxxxx>]

Scott Blachowicz <scott@xxxxxxxxxxx> wrote:

> so it looks like the Doc Makefile can't handle a redirected srcdir.  I
> made these changes to get it going:

Yes, I'm an idiot...I transcribed the patch and didn't test it...it was SO
simple. :-)

At any rate, I forgot the part about editing zshall.man into zshall.1, so
here is an updated patch (of probably the wrong way to fix it :-)) for
Doc/Makefile.in.

Thou shalt test precisely what thou sends...
Thou shalt test precisely what thou sends...
Thou shalt test precisely what thou sends...

Scott Blachowicz    Ph: 206/283-8802x240    StatSci, a div of MathSoft, Inc.
                                            1700 Westlake Ave N #500
scott@xxxxxxxxxxx                           Seattle, WA USA   98109
Scott.Blachowicz@xxxxxxxxxxx

--- Makefile.in.dist	Wed Dec  6 14:08:37 1995
+++ Makefile.in	Wed Dec  6 15:29:32 1995
@@ -45,9 +45,9 @@
 .SUFFIXES:
 
 # man pages to install
-MAN = zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 \
-zshmisc.1 zshoptions.1 zshparam.1 zshzle.1 \
-zshall.1
+MAN = $(srcdir)/zsh.1 $(srcdir)/zshbuiltins.1 $(srcdir)/zshcompctl.1 \
+$(srcdir)/zshexpn.1 $(srcdir)/zshmisc.1 $(srcdir)/zshoptions.1 \
+$(srcdir)/zshparam.1 $(srcdir)/zshzle.1 zshall.1
 
 # man pages contained in distribution
 DISTMAN = zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 \
@@ -69,7 +69,7 @@
 all: $(MAN)
 
 zshall.1:
-	$(SED) -e 's|path-to-man-pages|$(mandir)/man$(manext)|' < zshall.man > $@
+	$(SED) -e 's|path-to-man-pages|$(mandir)/man$(manext)|' < $(srcdir)/zshall.man > $@
 
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
@@ -83,8 +83,8 @@
 install.man: $(MAN)
 	$(top_srcdir)/mkinstalldirs $(mandir)/man$(manext)
 	for file in $(MAN); do \
-	  man=`echo $$file | $(SED) s/\.1/\.$(manext)/`; \
-	  $(INSTALL_DATA) $(srcdir)/$$file $(mandir)/man$(manext)/$$man ; \
+	  man=`echo $$file | $(SED) -e s,.*/,, -e s/\.1/\.$(manext)/`; \
+	  $(INSTALL_DATA) $$file $(mandir)/man$(manext)/$$man ; \
 	done
 
 # install info pages, creating install directory if necessary
@@ -98,7 +98,7 @@
 uninstall.man:
 	cd $(mandir)/man$(manext); \
 	for file in $(MAN); do \
-	  man=`echo $$file | $(SED) s/\.1/\.$(manext)/`; \
+	  man=`echo $$file | $(SED) -e s,.*/,, -e s/\.1/\.$(manext)/`; \
 	  rm -f $$man; \
 	done