Remove unnecessary assignments of "INSTALL", "INSTALL_DATA",

"INSTALL_PROGRAM" and "INSTALL_SCRIPT" from "CONFIGURE_ENV".

11 files changed, 17 insertions, 38 deletions

diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index d2542b6d14b..d73ee00b66d 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/05/20 19:12:12 tron Exp $
+# $NetBSD: Makefile,v 1.18 1999/05/20 20:09:53 tron Exp $
 #
 
 DISTNAME=	gnome-core-1.0.5
@@ -27,8 +27,7 @@ LOCALSTATEDIR=	/var/gnome
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 			--with-glib-prefix=${LOCALBASE}
 CPPFLAGS=		-I${LOCALBASE}/include -I${WRKDIR}
-CONFIGURE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-			LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
+CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
 			CPPFLAGS="${CPPFLAGS}"
 
 pre-configure:
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 54bf4be6b1d..716545145c6 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 1999/05/04 20:31:32 tron Exp $
+# $NetBSD: Makefile,v 1.24 1999/05/20 20:09:52 tron Exp $
 #
 
 DISTNAME=	gnome-libs-1.0.9
@@ -24,7 +24,6 @@ LDFLAGS+=       	"-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 			--with-glib-prefix=${LOCALBASE}
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 			LOCALBASE=${LOCALBASE} \
 			X11BASE=${X11BASE}
 
diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index 5a2b6ddbe3e..9c2a43f0c66 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/05/02 14:35:58 tron Exp $
+# $NetBSD: Makefile,v 1.6 1999/05/20 20:09:52 tron Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp
 #
 
@@ -23,7 +23,6 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 CONFIGURE_ARGS=	--without-gnome
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 856271f0551..737e1c64a8f 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 1999/05/02 14:24:58 tron Exp $
+# $NetBSD: Makefile,v 1.31 1999/05/20 20:09:52 tron Exp $
 
 DISTNAME=	gtk+-1.2.2
 CATEGORIES=	x11
@@ -19,9 +19,7 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 
 GNU_CONFIGURE=  yes
-CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		INSTALL_DATA="${INSTALL_DATA}" \
-		CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
 
 INFO_FILES=	gdk.info gtk.info
 
diff --git a/x11/gtk10/Makefile b/x11/gtk10/Makefile
index 6b9d714152b..bd2d46b9c9b 100644
--- a/x11/gtk10/Makefile
+++ b/x11/gtk10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/02/19 14:22:47 rh Exp $
+# $NetBSD: Makefile,v 1.9 1999/05/20 20:09:53 tron Exp $
 
 DISTNAME=	gtk+-1.0.6
 PKGNAME=	gtk10-1.0.6
@@ -16,8 +16,6 @@ USE_LIBTOOL=	yes
 USE_X11BASE=	yes
 
 GNU_CONFIGURE=  yes
-CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		INSTALL_DATA="${INSTALL_DATA}"
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk10
 
 CFLAGS=		-pipe -O2
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 8b330c8958e..5475bd89a49 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 1999/04/24 06:53:42 tron Exp $
+# $NetBSD: Makefile,v 1.35 1999/05/20 20:09:52 tron Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 #
 
@@ -25,10 +25,7 @@ CONFIGURE_ARGS=	--datadir=${PREFIX}/share/kde \
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
-		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib" \
-		INSTALL_DATA="${INSTALL_DATA}" \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib"
 
 PLIST_SRC=	${WRKDIR}/PLIST
 PLIST_DIRS=	share/kde/applnk share/kde/apps/kappfinder \
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index 00c189a5831..d138ea5cdc7 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/04/01 23:03:38 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/20 20:09:53 tron Exp $
 #
 
 DISTNAME=	khostchooser-0.3
@@ -27,9 +27,6 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 		CXXFLAGS="${CFLAGS}" \
-		all_libraries="-L${LOCALBASE}/lib" \
-		INSTALL_DATA="${INSTALL_DATA}" \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+		all_libraries="-L${LOCALBASE}/lib"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 14a6a4454d3..ba0c471131c 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 1999/02/20 22:48:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.38 1999/05/20 20:09:52 tron Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
 #
 
@@ -17,8 +17,7 @@ USE_X11BASE=	yes
 # disable this for debugging
 CONFIGURE_ARGS+=--enable-production
 
-CONFIGURE_ENV=	CCFLAGS="-O -pipe" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		VarHaveMan2html=0
+CONFIGURE_ENV=	CCFLAGS="-O -pipe" VarHaveMan2html=0
 
 pre-fetch:
 	@if [ -d ${X11BASE}/include/Xm ]; then 				\
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index 95d641f6c00..67cad95c122 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 1999/05/02 17:59:21 rh Exp $
+# $NetBSD: Makefile,v 1.29 1999/05/20 20:09:53 tron Exp $
 
 DISTNAME=		WindowMaker-0.53.0
 PKGNAME=		windowmaker-0.53.0
@@ -25,9 +25,6 @@ CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/share/locale \
 			--with-incs-from="-I${LOCALBASE}/include \
 				-I${LOCALBASE}/include/giflib"
 LDFLAGS+=		-L${LOCALBASE}/lib	# for libintl.a
-CONFIGURE_ENV+=		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-			INSTALL_DATA="${INSTALL_DATA}" \
-			INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
 # to support.  Currently supported options:
diff --git a/x11/wmakerconf/Makefile b/x11/wmakerconf/Makefile
index f38a6e952d1..a6cfed90745 100644
--- a/x11/wmakerconf/Makefile
+++ b/x11/wmakerconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/05/03 17:28:22 rh Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/20 20:09:53 tron Exp $
 #
 
 DISTNAME=	wmakerconf-1.99.4
@@ -19,7 +19,6 @@ DEPENDS+=	gtk+-1.2.2:../../x11/gtk
 
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmextra/Makefile b/x11/wmextra/Makefile
index 8626004c095..ca8054adbd6 100644
--- a/x11/wmextra/Makefile
+++ b/x11/wmextra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/05/02 18:04:50 rh Exp $
+# $NetBSD: Makefile,v 1.3 1999/05/20 20:09:53 tron Exp $
 
 DISTNAME=		WindowMaker-extra-0.1
 PKGNAME=		wmextra-0.1
@@ -13,8 +13,5 @@ DEPENDS+=		windowmaker-0.53.0:../../x11/windowmaker
 
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-			INSTALL_DATA="${INSTALL_DATA}" \
-			INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 .include "../../mk/bsd.pkg.mk"