From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-request@math.gatech.edu>
Received: (qmail 22385 invoked from network); 16 Jan 1998 10:32:50 -0000
Received: from math.gatech.edu (list@130.207.146.50)
  by ns1.primenet.com.au with SMTP; 16 Jan 1998 10:32:50 -0000
Received: (from list@localhost)
	by math.gatech.edu (8.8.5/8.8.5) id FAA15853;
	Fri, 16 Jan 1998 05:15:05 -0500 (EST)
Resent-Date: Fri, 16 Jan 1998 05:15:05 -0500 (EST)
Date: Fri, 16 Jan 1998 10:16:04 GMT
From: Andrew Main <zefram@tao.co.uk>
Message-Id: <199801161016.KAA01963@taos.demon.co.uk>
To: zsh-workers@math.gatech.edu
Subject: PATCH: relative pathname to install
X-Patch: 266
Resent-Message-ID: <"3oYxX3.0.et3.dCplq"@math>
Resent-From: zsh-workers@math.gatech.edu
X-Mailing-List: <zsh-workers@math.gatech.edu> archive/latest/3716
X-Loop: zsh-workers@math.gatech.edu
Precedence: list
Resent-Sender: zsh-workers-request@math.gatech.edu

-----BEGIN PGP SIGNED MESSAGE-----

Here is the secondary job of 3706 (allowing $(INSTALL) to be set
to a relative pathname by configure) done more completely: all the
affected files are changed to not pass INSTALL* on to recursive makes.
Makemod.in.in was also redundantly defining INSTALL twice.

If you do not unapply 3706 before applying this, two hunks will fail,
both of which can be ignored.

 -zefram

 *** Makefile.in	1998/01/11 15:57:29	1.14
 --- Makefile.in	1998/01/16 00:27:57
 ***************
 *** 82,89 ****
   DLCFLAGS='$(DLCFLAGS)' DLLDFLAGS='$(DLLDFLAGS)' \
   LIBLDFLAGS='$(LIBLDFLAGS)' EXELDFLAGS='$(EXELDFLAGS)' \
   LIBS='$(LIBS)' DL_EXT='$(DL_EXT)' DLLD='$(DLLD)' \
 ! AWK='$(AWK)' YODL='$(YODL)' INSTALL='$(INSTALL)' \
 ! INSTALL_PROGRAM='$(INSTALL_PROGRAM)' INSTALL_DATA='$(INSTALL_DATA)'
   
   .SUFFIXES:
   
 --- 82,88 ----
   DLCFLAGS='$(DLCFLAGS)' DLLDFLAGS='$(DLLDFLAGS)' \
   LIBLDFLAGS='$(LIBLDFLAGS)' EXELDFLAGS='$(EXELDFLAGS)' \
   LIBS='$(LIBS)' DL_EXT='$(DL_EXT)' DLLD='$(DLLD)' \
 ! AWK='$(AWK)' YODL='$(YODL)'
   
   .SUFFIXES:
   
 *** Src/Makefile.in	1998/01/16 00:20:09	1.50
 --- Src/Makefile.in	1998/01/16 00:28:16
 ***************
 *** 81,88 ****
   DLCFLAGS='$(DLCFLAGS)' DLLDFLAGS='$(DLLDFLAGS)' \
   LIBLDFLAGS='$(LIBLDFLAGS)' EXELDFLAGS='$(EXELDFLAGS)' \
   LIBS='$(LIBS)' DL_EXT='$(DL_EXT)' DLLD='$(DLLD)' \
 ! AWK='$(AWK)' YODL='$(YODL)' INSTALL='$(INSTALL)' \
 ! INSTALL_PROGRAM='$(INSTALL_PROGRAM)' INSTALL_DATA='$(INSTALL_DATA)'
   
   # ========= DEPENDENCIES FOR BUILDING ==========
   
 --- 81,87 ----
   DLCFLAGS='$(DLCFLAGS)' DLLDFLAGS='$(DLLDFLAGS)' \
   LIBLDFLAGS='$(LIBLDFLAGS)' EXELDFLAGS='$(EXELDFLAGS)' \
   LIBS='$(LIBS)' DL_EXT='$(DL_EXT)' DLLD='$(DLLD)' \
 ! AWK='$(AWK)' YODL='$(YODL)'
   
   # ========= DEPENDENCIES FOR BUILDING ==========
   
 *** Src/Makemod.in.in	1998/01/11 15:57:40	1.3
 --- Src/Makemod.in.in	1998/01/16 00:28:45
 ***************
 *** 81,88 ****
   DLCFLAGS='$(DLCFLAGS)' DLLDFLAGS='$(DLLDFLAGS)' \
   LIBLDFLAGS='$(LIBLDFLAGS)' EXELDFLAGS='$(EXELDFLAGS)' \
   LIBS='$(LIBS)' DL_EXT='$(DL_EXT)' DLLD='$(DLLD)' \
 ! AWK='$(AWK)' YODL='$(YODL)' INSTALL='$(INSTALL)' \
 ! INSTALL_PROGRAM='$(INSTALL_PROGRAM)' INSTALL_DATA='$(INSTALL_DATA)'
   
   # ========== COMPILATION RULES ==========
   
 --- 81,87 ----
   DLCFLAGS='$(DLCFLAGS)' DLLDFLAGS='$(DLLDFLAGS)' \
   LIBLDFLAGS='$(LIBLDFLAGS)' EXELDFLAGS='$(EXELDFLAGS)' \
   LIBS='$(LIBS)' DL_EXT='$(DL_EXT)' DLLD='$(DLLD)' \
 ! AWK='$(AWK)' YODL='$(YODL)'
   
   # ========== COMPILATION RULES ==========
   
 ***************
 *** 92,100 ****
   DLCOMPILE   = $(CC) -c -I. $(CPPFLAGS) $(DEFS) -DMODULE $(CFLAGS) $(DLCFLAGS)
   LINK        = $(CC) $(LDFLAGS) $(EXELDFLAGS) $(EXTRA_LDFLAGS) -o $@
   DLLINK      = $(DLLD) $(LDFLAGS) $(LIBLDFLAGS) $(DLLDFLAGS) -o $@
 - 
 - INSTALL         = @INSTALL@
 - INSTALL_PROGRAM = @INSTALL_PROGRAM@
   
   KNR_OBJ=.o
   KNROBJ=._foo_
 --- 91,96 ----

-----BEGIN PGP SIGNATURE-----
Version: 2.6.3ia
Charset: ascii

iQEVAwUBNL6r+Jmk9GeOHh7BAQG+Uwf7BWtaqwTNFEi3XyidVmpRAAmmTfmDcpkL
c5nUjx5QXAbf7ftdMc5DGVx0JhQFsdw2kyII/gXjWnFOubqQ/KSNPVSPTuV5u/8I
CX/sbWX3IdbWzZ9J8oso/ezmUFqmzJnyBmZ2b4otRixqHo2fc2cZh19kS+AtWEAw
yE0jZBeREd7w0vt79EjW8yu6moixrWNquLHdn67R22iYnvYuPW4p85vASvsf3Eua
HhofZFucDzo1ufoBroYeHroWCLQ88C2DsVytUHWCwfKXYjTHxh9QpPxwOBAWHx0e
AZB9w7mj1LJ2TEh59pcvzee9z4Z9eB5F45bJezfN2iZg3k7+j/o6Mg==
=tjZ2
-----END PGP SIGNATURE-----