From 56ef2cc9140ad9e2f60bacd59a862182047c4d96 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sun, 19 Jan 2003 00:09:44 +0000
Subject: [PATCH] More bugfixes

---
 make/lrzsz.mk        |  2 +-
 make/netkitbase.mk   | 23 ++++-------------------
 make/netkittelnet.mk | 23 ++++-------------------
 3 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/make/lrzsz.mk b/make/lrzsz.mk
index bcb4293f92..adbf1ebbb5 100644
--- a/make/lrzsz.mk
+++ b/make/lrzsz.mk
@@ -1,6 +1,6 @@
 #############################################################
 #
-# lrzsz (provided zmodem)
+# lrzsz (provides zmodem)
 #
 #############################################################
 # Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
diff --git a/make/netkitbase.mk b/make/netkitbase.mk
index 95918c81f8..c5a3f657ab 100644
--- a/make/netkitbase.mk
+++ b/make/netkitbase.mk
@@ -6,7 +6,7 @@
 NETKITBASE_SOURCE:=netkit-base-0.17.tar.gz
 NETKITBASE_SITE:=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 NETKITBASE_DIR:=$(BUILD_DIR)/netkit-base-0.17
-NETKITBASE_CAT:=bzcat
+NETKITBASE_CAT:=zcat
 NETKITBASE_BINARY:=inetd/inetd
 NETKITBASE_TARGET_BINARY:=usr/sbin/inetd
 
@@ -24,24 +24,9 @@ $(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE)
 	touch $(NETKITBASE_DIR)/.unpacked
 
 $(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked
-	(cd $(NETKITBASE_DIR); rm -rf config.cache; \
-		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
-		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--disable-nls \
-		--installroot=$(TARGET_DIR) \
-		--with-c-compiler=$(TARGET_CC) \
-	);
+	(cd $(NETKITBASE_DIR); PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure --installroot=$(TARGET_DIR) --with-c-compiler=$(TARGET_CC) \
+	)
 	touch  $(NETKITBASE_DIR)/.configured
 
 $(NETKITBASE_DIR)/$(NETKITBASE_BINARY): $(NETKITBASE_DIR)/.configured
diff --git a/make/netkittelnet.mk b/make/netkittelnet.mk
index 399aaa81fd..acb01e5397 100644
--- a/make/netkittelnet.mk
+++ b/make/netkittelnet.mk
@@ -6,7 +6,7 @@
 NETKITTELNET_SOURCE:=netkit-telnet-0.17.tar.gz
 NETKITTELNET_SITE:=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
 NETKITTELNET_DIR:=$(BUILD_DIR)/netkit-telnet-0.17
-NETKITTELNET_CAT:=bzcat
+NETKITTELNET_CAT:=zcat
 NETKITTELNET_BINARY:=telnetd/telnetd
 NETKITTELNET_TARGET_BINARY:=usr/sbin/telnetd
 NETKITTELNET_PATCH:=$(SOURCE_DIR)/netkittelnet.patch
@@ -27,24 +27,9 @@ $(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE)
 	touch $(NETKITTELNET_DIR)/.unpacked
 
 $(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked
-	(cd $(NETKITTELNET_DIR); rm -rf config.cache; \
-		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
-		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--disable-nls \
-		--installroot=$(TARGET_DIR) \
-		--with-c-compiler=$(TARGET_CC) \
-	);
+	(cd $(NETKITTELNET_DIR); PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure --installroot=$(TARGET_DIR) --with-c-compiler=$(TARGET_CC) \
+	)
 	touch  $(NETKITTELNET_DIR)/.configured
 
 $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY): $(NETKITTELNET_DIR)/.configured
-- 
2.30.2