By popular demand, use 'sed' rather than 'perl' for doing

search and replace stuff.  Hopefully we do not have any
perl specific regexs that will be broken by this change,
but it seems to be working thus far anyways,

30 files changed, 94 insertions, 94 deletions

diff --git a/make/bash.mk b/make/bash.mk
index c919a066f..1b30dfc56 100644
--- a/make/bash.mk
+++ b/make/bash.mk
@@ -18,7 +18,7 @@ bash-source: $(DL_DIR)/$(BASH_SOURCE)
 $(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE)
 	$(BASH_CAT) $(DL_DIR)/$(BASH_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	# This is broken when -lintl is added to LIBS
-	perl -i -p -e 's,LIBS_FOR_BUILD =.*,LIBS_FOR_BUILD =,g' \
+	sed -ie 's,LIBS_FOR_BUILD =.*,LIBS_FOR_BUILD =,g' \
 		$(BASH_DIR)/builtins/Makefile.in
 	touch $(BASH_DIR)/.unpacked
 
diff --git a/make/berkeleydb.mk b/make/berkeleydb.mk
index 3d7533487..dc4bb2558 100644
--- a/make/berkeleydb.mk
+++ b/make/berkeleydb.mk
@@ -43,7 +43,7 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
 		--disable-compat185 \
 		--with-pic \
 	);
-	perl -i -p -e 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile
+	sed -ie 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile
 	touch  $(DB_DIR)/.configured
 
 $(DB_DIR)/build_unix/.libs/libdb-4.1.so: $(DB_DIR)/.configured
diff --git a/make/busybox.mk b/make/busybox.mk
index d7b682b47..38c32035b 100644
--- a/make/busybox.mk
+++ b/make/busybox.mk
@@ -28,18 +28,18 @@ $(BUSYBOX_DIR)/.configured: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG)
 	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 ifeq ($(USE_BUSYBOX_SNAPSHOT),true)
 	cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.config
-	perl -i -p -e "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
+	sed -ie "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
 		PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak
 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
-	perl -i -p -e "s/^.*DOLFS.*/DOLFS=y/;" $(BUSYBOX_DIR)/.config
+	sed -ie "s/^.*DOLFS.*/DOLFS=y/;" $(BUSYBOX_DIR)/.config
 endif
 	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
 else  # Not using snapshot
 	cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/Config.h
-	perl -i -p -e "s,^CROSS.*,CROSS=$(TARGET_CROSS),;" $(BUSYBOX_DIR)/Makefile
-	perl -i -p -e "s,^PREFIX.*,PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Makefile
+	sed -ie "s,^CROSS.*,CROSS=$(TARGET_CROSS),;" $(BUSYBOX_DIR)/Makefile
+	sed -ie "s,^PREFIX.*,PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Makefile
 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
-	perl -i -p -e "s/^DOLFS.*/DOLFS=true/;" $(BUSYBOX_DIR)/Makefile
+	sed -ie "s/^DOLFS.*/DOLFS=true/;" $(BUSYBOX_DIR)/Makefile
 endif
 endif
 	touch $(BUSYBOX_DIR)/.configured
diff --git a/make/bzip2.mk b/make/bzip2.mk
index 187795f9d..60b6ceb32 100644
--- a/make/bzip2.mk
+++ b/make/bzip2.mk
@@ -21,8 +21,8 @@ bzip2-source: $(DL_DIR)/$(BZIP2_SOURCE)
 
 $(BZIP2_DIR)/.unpacked: $(DL_DIR)/$(BZIP2_SOURCE)
 	$(BZIP2_CAT) $(DL_DIR)/$(BZIP2_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	perl -pi -e "s,ln \\$$\(,ln -sf \\$$\(,g" $(BZIP2_DIR)/Makefile
-	perl -pi -e "s,ln -s (lib.*),ln -sf \$$1 ; ln -sf libbz2.so.1.0.2 libbz2.so,g" \
+	sed -ie "s,ln \\$$\(,ln -sf \\$$\(,g" $(BZIP2_DIR)/Makefile
+	sed -ie "s,ln -s (lib.*),ln -sf \$$1 ; ln -sf libbz2.so.1.0.2 libbz2.so,g" \
 	    $(BZIP2_DIR)/Makefile-libbz2_so
 	touch $(BZIP2_DIR)/.unpacked
 
diff --git a/make/coreutils.mk b/make/coreutils.mk
index 5c4e28a28..1a4f1c298 100644
--- a/make/coreutils.mk
+++ b/make/coreutils.mk
@@ -45,10 +45,10 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
 	);
 	#Fix up the max number of open files per process, which apparently 
 	# is not set when cross compiling
-	perl -i -p -e 's,.*UTILS_OPEN_MAX.*,#define UTILS_OPEN_MAX 1019,g' \
+	sed -ie 's,.*UTILS_OPEN_MAX.*,#define UTILS_OPEN_MAX 1019,g' \
 		$(COREUTILS_DIR)/config.h
 	# This is undefined when crosscompiling...
-	perl -i -p -e 's,.*HAVE_PROC_UPTIME.*,#define HAVE_PROC_UPTIME 1,g' \
+	sed -ie 's,.*HAVE_PROC_UPTIME.*,#define HAVE_PROC_UPTIME 1,g' \
 		$(COREUTILS_DIR)/config.h
 	touch  $(COREUTILS_DIR)/.configured
 
diff --git a/make/fakeroot.mk b/make/fakeroot.mk
index 2096c7f4a..c0b377715 100644
--- a/make/fakeroot.mk
+++ b/make/fakeroot.mk
@@ -17,7 +17,7 @@ fakeroot-source: $(DL_DIR)/$(FAKEROOT_SOURCE)
 $(FAKEROOT_DIR)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
 	$(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	# If using busybox getopt, make it be quiet.
-	perl -pi -e "s,getopt --version,getopt --version 2>/dev/null," \
+	sed -ie "s,getopt --version,getopt --version 2>/dev/null," \
 		$(FAKEROOT_DIR)/scripts/fakeroot
 	touch $(FAKEROOT_DIR)/.unpacked
 
diff --git a/make/gcc-2.95.mk b/make/gcc-2.95.mk
index 9c7d13c06..5a0413740 100644
--- a/make/gcc-2.95.mk
+++ b/make/gcc-2.95.mk
@@ -67,40 +67,40 @@ $(GCC_DIR)/.gcc2_95_build_hacks: $(GCC_DIR)/.patched
 	#
 	(cd $(GCC_DIR); set -e; export LIST=`grep -lr -- "-dynamic-linker.*\.so[\.0-9]*" *`;\
 		if [ -n "$$LIST" ] ; then \
-		perl -i -p -e "s,-dynamic-linker.*\.so[\.0-9]*},\
+		sed -ie "s,-dynamic-linker.*\.so[\.0-9]*},\
 		    -dynamic-linker /lib/ld-uClibc.so.0},;" $$LIST; fi);
 	#
 	# Prevent system glibc start files from leaking in uninvited...
 	#
-	perl -i -p -e "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 =\
+	sed -ie "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 =\
 		\"$(STAGING_DIR)/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
-	perl -i -p -e "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 =\
+	sed -ie "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 =\
 		\"$(STAGING_DIR)/usr/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
 	#
 	# Prevent system glibc include files from leaking in uninvited...
 	#
-	perl -i -p -e "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=\
+	sed -ie "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=\
 		$(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
-	perl -i -p -e "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=\
+	sed -ie "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=\
 		$(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
-	perl -i -p -e "s,^#define.*STANDARD_INCLUDE_DIR.*,#define STANDARD_INCLUDE_DIR \
+	sed -ie "s,^#define.*STANDARD_INCLUDE_DIR.*,#define STANDARD_INCLUDE_DIR \
 		\"$(STAGING_DIR)/include\",;" $(GCC_DIR)/gcc/cppdefault.h;
 	#
 	# Prevent system glibc libraries from being found by collect2 
 	# when it calls locatelib() and rummages about the system looking 
 	# for libraries with the correct name...
 	#
-	perl -i -p -e "s,\"/lib,\"$(STAGING_DIR)/lib,g;" $(GCC_DIR)/gcc/collect2.c
-	perl -i -p -e "s,\"/usr/,\"$(STAGING_DIR)/usr/,g;" $(GCC_DIR)/gcc/collect2.c
+	sed -ie "s,\"/lib,\"$(STAGING_DIR)/lib,g;" $(GCC_DIR)/gcc/collect2.c
+	sed -ie "s,\"/usr/,\"$(STAGING_DIR)/usr/,g;" $(GCC_DIR)/gcc/collect2.c
 	#
 	# Prevent gcc from using the unwind-dw2-fde-glibc code
 	#
-	perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
+	sed -ie "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
 		#ifndef inhibit_libc,g;" $(GCC_DIR)/gcc/unwind-dw2-fde-glibc.c;
 	#
 	# Use atexit() directly, rather than cxa_atexit
 	#
-	perl -i -p -e "s,int flag_use_cxa_atexit = 1;,int flag_use_cxa_atexit = 0;,g;"\
+	sed -ie "s,int flag_use_cxa_atexit = 1;,int flag_use_cxa_atexit = 0;,g;"\
 		$(GCC_DIR)/gcc/cp/decl2.c;
 	#
 	# We do not wish to build the libstdc++ library provided with gcc,
diff --git a/make/gcc-3.3.mk b/make/gcc-3.3.mk
index d145bdd3f..572115642 100644
--- a/make/gcc-3.3.mk
+++ b/make/gcc-3.3.mk
@@ -80,35 +80,35 @@ $(GCC_DIR)/.gcc3_3_build_hacks: $(GCC_DIR)/.patched
 	#
 	(cd $(GCC_DIR); set -e; export LIST=`grep -lr -- "-dynamic-linker.*\.so[\.0-9]*" *`;\
 		if [ -n "$$LIST" ] ; then \
-		perl -i -p -e "s,-dynamic-linker.*\.so[\.0-9]*},\
+		sed -ie "s,-dynamic-linker.*\.so[\.0-9]*},\
 		    -dynamic-linker /lib/ld-uClibc.so.0},;" $$LIST; fi);
 	#
 	# Prevent system glibc start files from leaking in uninvited...
 	#
-	perl -i -p -e "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 =\
+	sed -ie "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 =\
 		\"$(STAGING_DIR)/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
-	perl -i -p -e "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 =\
+	sed -ie "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 =\
 		\"$(STAGING_DIR)/usr/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
 	#
 	# Prevent system glibc include files from leaking in uninvited...
 	#
-	perl -i -p -e "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=\
+	sed -ie "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=\
 		$(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
-	perl -i -p -e "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=\
+	sed -ie "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=\
 		$(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
-	perl -i -p -e "s,^#define.*STANDARD_INCLUDE_DIR.*,#define STANDARD_INCLUDE_DIR \
+	sed -ie "s,^#define.*STANDARD_INCLUDE_DIR.*,#define STANDARD_INCLUDE_DIR \
 		\"$(STAGING_DIR)/include\",;" $(GCC_DIR)/gcc/cppdefault.h;
 	#
 	# Prevent system glibc libraries from being found by collect2 
 	# when it calls locatelib() and rummages about the system looking 
 	# for libraries with the correct name...
 	#
-	perl -i -p -e "s,\"/lib,\"$(STAGING_DIR)/lib,g;" $(GCC_DIR)/gcc/collect2.c
-	perl -i -p -e "s,\"/usr/,\"$(STAGING_DIR)/usr/,g;" $(GCC_DIR)/gcc/collect2.c
+	sed -ie "s,\"/lib,\"$(STAGING_DIR)/lib,g;" $(GCC_DIR)/gcc/collect2.c
+	sed -ie "s,\"/usr/,\"$(STAGING_DIR)/usr/,g;" $(GCC_DIR)/gcc/collect2.c
 	#
 	# Prevent gcc from using the unwind-dw2-fde-glibc code
 	#
-	perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
+	sed -ie "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
 		#ifndef inhibit_libc,g;" $(GCC_DIR)/gcc/unwind-dw2-fde-glibc.c;
 	touch $(GCC_DIR)/.gcc3_3_build_hacks
 
@@ -193,10 +193,10 @@ $(GCC_DIR)/.g++_build_hacks: $(GCC_DIR)/.patched
 	#
 	# Hack up the soname for libstdc++
 	# 
-	perl -i -p -e "s,\.so\.1,.so.0.9.9,g;" $(GCC_DIR)/gcc/config/t-slibgcc-elf-ver;
-	perl -i -p -e "s,-version-info.*[0-9]:[0-9]:[0-9],-version-info 9:9:0,g;" \
+	sed -ie "s,\.so\.1,.so.0.9.9,g;" $(GCC_DIR)/gcc/config/t-slibgcc-elf-ver;
+	sed -ie "s,-version-info.*[0-9]:[0-9]:[0-9],-version-info 9:9:0,g;" \
 		$(GCC_DIR)/libstdc++-v3/src/Makefile.am $(GCC_DIR)/libstdc++-v3/src/Makefile.in;
-	perl -i -p -e "s,3\.0\.0,9.9.0,g;" $(GCC_DIR)/libstdc++-v3/acinclude.m4 \
+	sed -ie "s,3\.0\.0,9.9.0,g;" $(GCC_DIR)/libstdc++-v3/acinclude.m4 \
 		$(GCC_DIR)/libstdc++-v3/aclocal.m4 $(GCC_DIR)/libstdc++-v3/configure;
 	touch $(GCC_DIR)/.g++_build_hacks
 
@@ -365,21 +365,21 @@ $(GCC_BUILD_DIR3)/.gcc3_3_build_hacks: $(GCC_BUILD_DIR3)/.patched
 	#
 	(cd $(GCC_BUILD_DIR3); set -e; export LIST=`grep -lr -- "-dynamic-linker.*\.so[\.0-9]*" *`;\
 		if [ -n "$$LIST" ] ; then \
-		perl -i -p -e "s,-dynamic-linker.*\.so[\.0-9]*},\
+		sed -ie "s,-dynamic-linker.*\.so[\.0-9]*},\
 		    -dynamic-linker /lib/ld-uClibc.so.0},;" $$LIST; fi);
 	#
 	# Prevent gcc from using the unwind-dw2-fde-glibc code
 	#
-	perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
+	sed -ie "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
 		#ifndef inhibit_libc,g;" $(GCC_BUILD_DIR3)/gcc/unwind-dw2-fde-glibc.c;
 	#
 	# Hack up the soname for libstdc++
 	# 
-	perl -i -p -e "s,\.so\.1,.so.0.9.9,g;" $(GCC_BUILD_DIR3)/gcc/config/t-slibgcc-elf-ver;
-	perl -i -p -e "s,-version-info.*[0-9]:[0-9]:[0-9],-version-info 9:9:0,g;" \
+	sed -ie "s,\.so\.1,.so.0.9.9,g;" $(GCC_BUILD_DIR3)/gcc/config/t-slibgcc-elf-ver;
+	sed -ie "s,-version-info.*[0-9]:[0-9]:[0-9],-version-info 9:9:0,g;" \
 		$(GCC_BUILD_DIR3)/libstdc++-v3/src/Makefile.am \
 		$(GCC_BUILD_DIR3)/libstdc++-v3/src/Makefile.in;
-	perl -i -p -e "s,3\.0\.0,9.9.0,g;" $(GCC_BUILD_DIR3)/libstdc++-v3/acinclude.m4 \
+	sed -ie "s,3\.0\.0,9.9.0,g;" $(GCC_BUILD_DIR3)/libstdc++-v3/acinclude.m4 \
 		$(GCC_BUILD_DIR3)/libstdc++-v3/aclocal.m4 \
 		$(GCC_BUILD_DIR3)/libstdc++-v3/configure;
 	touch $(GCC_BUILD_DIR3)/.gcc3_3_build_hacks
@@ -431,7 +431,7 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
 	# A nasty hack to work around g++ adding -lgcc_eh to the link
 	-(cd $(TARGET_DIR)/usr/lib/gcc-lib/$(ARCH)-linux/$(GCC_VERSION)/ ; ln -s libgcc.a libgcc_eh.a)
 	# Make sure gcc does not think we are cross compiling
-	perl -i -p -e "s/^1/0/;" $(TARGET_DIR)/usr/lib/gcc-lib/$(ARCH)-linux/$(GCC_VERSION)/specs
+	sed -ie "s/^1/0/;" $(TARGET_DIR)/usr/lib/gcc-lib/$(ARCH)-linux/$(GCC_VERSION)/specs
 	-(cd $(TARGET_DIR)/bin; find -type f | xargs $(STRIP) > /dev/null 2>&1)
 	-(cd $(TARGET_DIR)/usr/bin; find -type f | xargs $(STRIP) > /dev/null 2>&1)
 	-(cd $(TARGET_DIR)/usr/lib/gcc-lib/$(ARCH)-linux/$(GCC_VERSION); $(STRIP) cc1 cc1plus collect2 > /dev/null 2>&1)
diff --git a/make/gdb.mk b/make/gdb.mk
index bc2b25484..7bbab76e2 100644
--- a/make/gdb.mk
+++ b/make/gdb.mk
@@ -45,7 +45,7 @@ $(GDB_DIR)/.configured: $(GDB_DIR)/.unpacked
 		--without-included-gettext \
 	);
 ifeq ($(ENABLE_LOCALE),true)
-	-perl -i -p -e "s,^INTL *=.*,INTL = -lintl,g;" $(GDB_DIR)/gdb/Makefile
+	-sed -ie "s,^INTL *=.*,INTL = -lintl,g;" $(GDB_DIR)/gdb/Makefile
 endif
 	touch  $(GDB_DIR)/.configured
 
diff --git a/make/hostap.mk b/make/hostap.mk
index f06f15cea..3edcf9a35 100644
--- a/make/hostap.mk
+++ b/make/hostap.mk
@@ -19,7 +19,7 @@ $(HOSTAP_DIR)/.unpacked: $(DL_DIR)/$(HOSTAP_SOURCE)
 	touch $(HOSTAP_DIR)/.unpacked
 
 $(HOSTAP_DIR)/.configured: $(HOSTAP_DIR)/.unpacked
-	perl -pi -e "s,/.*#define PRISM2_DOWNLOAD_SUPPORT.*/,#define PRISM2_DOWNLOAD_SUPPORT,g" \
+	sed -ie "s,/.*#define PRISM2_DOWNLOAD_SUPPORT.*/,#define PRISM2_DOWNLOAD_SUPPORT,g" \
 		$(HOSTAP_DIR)/driver/modules/hostap_config.h
 	touch  $(HOSTAP_DIR)/.configured
 
diff --git a/make/iproute2.mk b/make/iproute2.mk
index 0863277d8..ba49864b7 100644
--- a/make/iproute2.mk
+++ b/make/iproute2.mk
@@ -29,14 +29,14 @@ $(IPROUTE2_DIR)/.unpacked: $(DL_DIR)/$(IPROUTE2_SOURCE) #$(DL_DIR)/$(IPROUTE2_PA
 	touch $(IPROUTE2_DIR)/.unpacked
 
 $(IPROUTE2_DIR)/.configured: $(IPROUTE2_DIR)/.unpacked
-	perl -pi -e "s,-I/usr/include/db3,," $(IPROUTE2_DIR)/Makefile
-	perl -pi -e "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
+	sed -ie "s,-I/usr/include/db3,," $(IPROUTE2_DIR)/Makefile
+	sed -ie "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
 		$(IPROUTE2_DIR)/Makefile
-	perl -pi -e "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
+	sed -ie "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
 		$(IPROUTE2_DIR)/Makefile
 	# For now disable compiling of the misc directory because it seems to fail
 	rm -rf $(IPROUTE2_DIR)/misc 
-	perl -pi -e "s, misc,," $(IPROUTE2_DIR)/Makefile
+	sed -ie "s, misc,," $(IPROUTE2_DIR)/Makefile
 	touch  $(IPROUTE2_DIR)/.configured
 
 $(IPROUTE2_DIR)/tc/tc: $(IPROUTE2_DIR)/.configured
diff --git a/make/iptables.mk b/make/iptables.mk
index fab2a1040..95be69fae 100644
--- a/make/iptables.mk
+++ b/make/iptables.mk
@@ -15,7 +15,7 @@ $(IPTABLES_BUILD_DIR)/.unpacked: $(DL_DIR)/$(IPTABLES_SOURCE)
 	touch $(IPTABLES_BUILD_DIR)/.unpacked
 
 $(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked
-	perl -pi -e "s@shell.*YES.*@shell grep -q '__UCLIBC_HAS_IPV6__.*1' \
+	sed -ie "s@shell.*YES.*@shell grep -q '__UCLIBC_HAS_IPV6__.*1' \
 		$(BUILD_DIR)/uClibc/include/bits/uClibc_config.h && \
 		echo YES\), YES\)@;" $(IPTABLES_BUILD_DIR)/Makefile
 	touch  $(IPTABLES_BUILD_DIR)/.configured
diff --git a/make/libtool.mk b/make/libtool.mk
index 6240f7073..77f1a3769 100644
--- a/make/libtool.mk
+++ b/make/libtool.mk
@@ -61,8 +61,8 @@ $(TARGET_DIR)/$(LIBTOOL_TARGET_BINARY): $(LIBTOOL_DIR)/$(LIBTOOL_BINARY)
 	    includedir=$(TARGET_DIR)/usr/include \
 	    -C $(LIBTOOL_DIR) install;
 	$(STRIP) $(TARGET_DIR)//usr/lib/libltdl.so.*.*.* > /dev/null 2>&1
-	perl -pi -e "s,^CC.*,CC=\"/usr/bin/gcc\"," $(TARGET_DIR)/usr/bin/libtool
-	perl -pi -e "s,^LD.*,LD=\"/usr/bin/ld\"," $(TARGET_DIR)/usr/bin/libtool
+	sed -ie "s,^CC.*,CC=\"/usr/bin/gcc\"," $(TARGET_DIR)/usr/bin/libtool
+	sed -ie "s,^LD.*,LD=\"/usr/bin/ld\"," $(TARGET_DIR)/usr/bin/libtool
 	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
diff --git a/make/linux.mk b/make/linux.mk
index 14ace8f86..fe44d703a 100644
--- a/make/linux.mk
+++ b/make/linux.mk
@@ -65,7 +65,7 @@ $(LINUX_KCONFIG):
 	fi;
 
 $(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured:  $(LINUX_DIR)/.unpacked  $(LINUX_KCONFIG)
-	perl -i -p -e "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
+	sed -ie "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
 	-cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
 	$(MAKE) -C $(LINUX_DIR) oldconfig include/linux/version.h
 	touch $(LINUX_DIR)/.configured
diff --git a/make/lrzsz.mk b/make/lrzsz.mk
index 493dbfc2f..dce1391d7 100644
--- a/make/lrzsz.mk
+++ b/make/lrzsz.mk
@@ -54,8 +54,8 @@ $(LRZSZ_DIR)/.configured: $(LRZSZ_DIR)/.unpacked
 		$(DISABLE_NLS) \
 		--disable-timesync \
 	);
-	perl -i -p -e "s/-lnsl//;" $(LRZSZ_DIR)/src/Makefile
-	perl -i -p -e "s~(#define ENABLE_SYSLOG.*)~/* \1 */~;" $(LRZSZ_DIR)/config.h
+	sed -ie "s/-lnsl//;" $(LRZSZ_DIR)/src/Makefile
+	sed -ie "s~(#define ENABLE_SYSLOG.*)~/* \1 */~;" $(LRZSZ_DIR)/config.h
 	touch  $(LRZSZ_DIR)/.configured
 
 $(LRZSZ_DIR)/src/lrz: $(LRZSZ_DIR)/.configured
diff --git a/make/microcom.mk b/make/microcom.mk
index 13714a46a..8c33173e7 100644
--- a/make/microcom.mk
+++ b/make/microcom.mk
@@ -40,7 +40,7 @@ $(MICROCOM_DIR)/.unpacked: $(DL_DIR)/$(MICROCOM_SOURCE)
 	touch  $(MICROCOM_DIR)/.unpacked
 
 $(MICROCOM_DIR)/.configured: $(MICROCOM_DIR)/.unpacked
-	perl -i -p -e 's~gcc~${TARGET_CC}~' $(MICROCOM_DIR)/Makefile
+	sed -ie 's~gcc~${TARGET_CC}~' $(MICROCOM_DIR)/Makefile
 	touch  $(MICROCOM_DIR)/.configured
 
 $(MICROCOM_DIR)/microcom: $(MICROCOM_DIR)/.configured
diff --git a/make/ncurses.mk b/make/ncurses.mk
index c0a555086..6c32bbda0 100644
--- a/make/ncurses.mk
+++ b/make/ncurses.mk
@@ -5,7 +5,7 @@
 #
 #############################################################
 # Copyright (C) 2002 by Ken Restivo <ken@246gt.com>
-# $Id: ncurses.mk,v 1.29 2003/11/12 09:31:12 andersen Exp $
+# $Id: ncurses.mk,v 1.30 2003/11/13 06:02:19 andersen Exp $
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Library General Public License as
@@ -33,7 +33,7 @@ $(DL_DIR)/$(NCURSES_SOURCE):
 $(NCURSES_DIR)/.dist: $(DL_DIR)/$(NCURSES_SOURCE)
 	gunzip -c $(DL_DIR)/$(NCURSES_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	#use the local tic and not whatever the build system was going to find.
-	perl -i -p -e 's~\$$srcdir/shlib tic\$$suffix~/usr/bin/tic~' \
+	sed -ie 's~\$$srcdir/shlib tic\$$suffix~/usr/bin/tic~' \
 		$(NCURSES_DIR)/misc/run_tic.in
 	touch  $(NCURSES_DIR)/.dist
 
diff --git a/make/netkitbase.mk b/make/netkitbase.mk
index 262b459e0..7db429957 100644
--- a/make/netkitbase.mk
+++ b/make/netkitbase.mk
@@ -18,9 +18,9 @@ netkitbase-source: $(DL_DIR)/$(NETKITBASE_SOURCE)
 $(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE)
 	$(NETKITBASE_CAT) $(DL_DIR)/$(NETKITBASE_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	# use ANSI syntax
-	perl -i -p -e "s/main\(\)/main(void)/;" $(NETKITBASE_DIR)/configure
+	sed -ie "s/main\(\)/main(void)/;" $(NETKITBASE_DIR)/configure
 	# don't try to run cross compiled binaries while configuring things
-	perl -i -p -e "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure
+	sed -ie "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure
 	touch $(NETKITBASE_DIR)/.unpacked
 
 $(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked
@@ -39,7 +39,7 @@ $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY
 	cp $(NETKITBASE_DIR)/$(NETKITBASE_BINARY) $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY)
 	mkdir -p $(TARGET_DIR)/etc
 	cp $(NETKITBASE_DIR)/etc.sample/inetd.conf $(TARGET_DIR)/etc/
-	perl -i -p -e "s/^([a-z])/#\1/;" $(TARGET_DIR)/etc/inetd.conf
+	sed -ie "s/^([a-z])/#\1/;" $(TARGET_DIR)/etc/inetd.conf
 	#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETKITBASE_DIR) install
 	#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 	#	$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
diff --git a/make/netkittelnet.mk b/make/netkittelnet.mk
index ab4a2cb26..6b4b129da 100644
--- a/make/netkittelnet.mk
+++ b/make/netkittelnet.mk
@@ -19,9 +19,9 @@ netkittelnet-source: $(DL_DIR)/$(NETKITTELNET_SOURCE)
 $(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE)
 	$(NETKITTELNET_CAT) $(DL_DIR)/$(NETKITTELNET_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	# use ANSI syntax
-	perl -i -p -e "s/main\(\)/main(void)/;" $(NETKITTELNET_DIR)/configure
+	sed -ie "s/main\(\)/main(void)/;" $(NETKITTELNET_DIR)/configure
 	# Disable termcap support
-	perl -i -p -e "s~(.*termcap\.h.*)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c
+	sed -ie "s~(.*termcap\.h.*)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c
 	# don't try to run cross compiled binaries while configuring things
 	cat $(NETKITTELNET_PATCH) | patch -p1 -d $(NETKITTELNET_DIR)
 	touch $(NETKITTELNET_DIR)/.unpacked
@@ -42,7 +42,7 @@ $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_
 	rm -f $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY)
 	cp $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY)
 	# Enable telnet in inetd
-	perl -i -p -e "s~^#telnet.*~telnet\tstream\ttcp\tnowait\troot\t/usr/sbin/telnetd\t/usr/sbin/telnetd~;" $(TARGET_DIR)/etc/inetd.conf
+	sed -ie "s~^#telnet.*~telnet\tstream\ttcp\tnowait\troot\t/usr/sbin/telnetd\t/usr/sbin/telnetd~;" $(TARGET_DIR)/etc/inetd.conf
 	#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(NETKITTELNET_DIR) install
 	#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 	#	$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
diff --git a/make/ntp.mk b/make/ntp.mk
index f691b6678..4b213339e 100644
--- a/make/ntp.mk
+++ b/make/ntp.mk
@@ -18,7 +18,7 @@ ntp-source: $(DL_DIR)/$(NTP_SOURCE)
 
 $(NTP_DIR)/.unpacked: $(DL_DIR)/$(NTP_SOURCE)
 	$(NTP_CAT) $(DL_DIR)/$(NTP_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	perl -i -p -e "s,^#if.*__GLIBC__.*_BSD_SOURCE.*$$,#if 0," \
+	sed -ie "s,^#if.*__GLIBC__.*_BSD_SOURCE.*$$,#if 0," \
 		$(NTP_DIR)/ntpd/refclock_pcf.c;
 	touch $(NTP_DIR)/.unpacked
 
diff --git a/make/openssl.mk b/make/openssl.mk
index 073d0f7d8..0d2fe309b 100644
--- a/make/openssl.mk
+++ b/make/openssl.mk
@@ -17,7 +17,7 @@ $(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE) $(OPENSSL_PATCH)
 	gunzip -c $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	cat $(OPENSSL_PATCH) | patch -p1 -d $(OPENSSL_DIR)
 	# sigh... we have to resort to this just to set a gcc flag.
-	perl -i -p -e 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \
+	sed -ie 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \
 		$(OPENSSL_DIR)/Configure
 	touch  $(OPENSSL_DIR)/.unpacked
 
diff --git a/make/pcmcia.mk b/make/pcmcia.mk
index 16927db27..3c40485df 100644
--- a/make/pcmcia.mk
+++ b/make/pcmcia.mk
@@ -45,9 +45,9 @@ $(PCMCIA_DIR)/.configured: $(PCMCIA_DIR)/.patched
 		--rcdir=/etc --arch=$(ARCH) --trust --srctree --nocardbus \
 		--sysv --kcc=$(KERNEL_CROSS)gcc --ucc=$(TARGET_CC) --ld=$(TARGET_CROSS)ld \
 		--target=$(TARGET_DIR))
-	perl -i -p -e "s/pump/udhcpc/" $(PCMCIA_DIR)/etc/network
-	perl -i -p -e "s/ide_cs/ide-cs/" $(PCMCIA_DIR)/etc/config
-	perl -i -p -e "s/bind \"wvlan_cs\"/bind \"orinoco_cs\"/g" $(PCMCIA_DIR)/etc/config
+	sed -ie "s/pump/udhcpc/" $(PCMCIA_DIR)/etc/network
+	sed -ie "s/ide_cs/ide-cs/" $(PCMCIA_DIR)/etc/config
+	sed -ie "s/bind \"wvlan_cs\"/bind \"orinoco_cs\"/g" $(PCMCIA_DIR)/etc/config
 	touch $(PCMCIA_DIR)/.configured
 
 $(PCMCIA_DIR)/cardmgr/cardmgr: $(PCMCIA_DIR)/.configured
diff --git a/make/perl.mk b/make/perl.mk
index f76a178d3..ffda6d16d 100644
--- a/make/perl.mk
+++ b/make/perl.mk
@@ -22,11 +22,11 @@ $(PERL_DIR)/.unpacked: $(DL_DIR)/$(PERL_SOURCE)
 	$(PERL_CAT) $(DL_DIR)/$(PERL_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	$(PERL_CAT) $(PERL_SOURCE_2) | tar -C $(PERL_DIR) -xvf -
 	cat $(PERL_PATCH) | patch -p1 -d $(PERL_DIR)
-	perl -pi -e "s,^ARCH.*,ARCH=$(ARCH)," $(PERL_DIR)/cross/config
-	perl -pi -e "s,^CONFIG_TARGET_.*,\#," $(PERL_DIR)/cross/config
-	perl -pi -e "s,^export CROSS=.*,export CROSS=$(TARGET_CROSS)," $(PERL_DIR)/cross/Makefile
-	perl -pi -e "s,TARGET_ARCH,$(ARCH)," $(PERL_DIR)/cross/config.sh.uclibc
-	perl -pi -e "s,TARGET_CROSS,$(TARGET_CROSS)," $(PERL_DIR)/cross/config.sh.uclibc
+	sed -ie "s,^ARCH.*,ARCH=$(ARCH)," $(PERL_DIR)/cross/config
+	sed -ie "s,^CONFIG_TARGET_.*,\#," $(PERL_DIR)/cross/config
+	sed -ie "s,^export CROSS=.*,export CROSS=$(TARGET_CROSS)," $(PERL_DIR)/cross/Makefile
+	sed -ie "s,TARGET_ARCH,$(ARCH)," $(PERL_DIR)/cross/config.sh.uclibc
+	sed -ie "s,TARGET_CROSS,$(TARGET_CROSS)," $(PERL_DIR)/cross/config.sh.uclibc
 	touch $(PERL_DIR)/.unpacked
 
 $(PERL_DIR)/.configured: $(PERL_DIR)/.unpacked
diff --git a/make/pppd.mk b/make/pppd.mk
index da7684070..f023fb38e 100644
--- a/make/pppd.mk
+++ b/make/pppd.mk
@@ -18,10 +18,10 @@ pppd-source: $(DL_DIR)/$(PPPD_SOURCE)
 
 $(PPPD_DIR)/.unpacked: $(DL_DIR)/$(PPPD_SOURCE)
 	$(PPPD_CAT) $(DL_DIR)/$(PPPD_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	perl -i -p -e 's/ -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP//' $(PPPD_DIR)/pppd/Makefile.linux
-	perl -i -p -e 's/$(INSTALL) -s/$(INSTALL)/' $(PPPD_DIR)/*/Makefile.linux
-	perl -i -p -e 's/ -o root//' $(PPPD_DIR)/*/Makefile.linux
-	perl -i -p -e 's/ -g daemon//' $(PPPD_DIR)/*/Makefile.linux
+	sed -ie 's/ -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP//' $(PPPD_DIR)/pppd/Makefile.linux
+	sed -ie 's/$(INSTALL) -s/$(INSTALL)/' $(PPPD_DIR)/*/Makefile.linux
+	sed -ie 's/ -o root//' $(PPPD_DIR)/*/Makefile.linux
+	sed -ie 's/ -g daemon//' $(PPPD_DIR)/*/Makefile.linux
 	touch $(PPPD_DIR)/.unpacked
 
 $(PPPD_DIR)/.configured: $(PPPD_DIR)/.unpacked
diff --git a/make/tinylogin.mk b/make/tinylogin.mk
index d24987712..a8de25d0b 100644
--- a/make/tinylogin.mk
+++ b/make/tinylogin.mk
@@ -24,11 +24,11 @@ tinylogin-source: $(DL_DIR)/$(TINYLOGIN_SOURCE)
 
 $(TINYLOGIN_DIR)/Config.h: $(DL_DIR)/$(TINYLOGIN_SOURCE)
 	bzcat $(DL_DIR)/$(TINYLOGIN_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	perl -i -p -e "s/\`id -u\` -ne 0/0 == 1/;" \
+	sed -ie "s/\`id -u\` -ne 0/0 == 1/;" \
 		-e "s/4755 --owner=root --group=root/755/" \
 		$(TINYLOGIN_DIR)/install.sh
-	perl -i -p -e "s/^DOSTATIC.*/DOSTATIC=false/g;" $(TINYLOGIN_DIR)/Makefile
-	perl -i -p -e "s/^DODEBUG.*/DODEBUG=false/g;" $(TINYLOGIN_DIR)/Makefile
+	sed -ie "s/^DOSTATIC.*/DOSTATIC=false/g;" $(TINYLOGIN_DIR)/Makefile
+	sed -ie "s/^DODEBUG.*/DODEBUG=false/g;" $(TINYLOGIN_DIR)/Makefile
 	# date test this one
 	touch $(TINYLOGIN_DIR)/Config.h
 
diff --git a/make/tinyx.mk b/make/tinyx.mk
index 9f79d2f95..984f6fa9a 100644
--- a/make/tinyx.mk
+++ b/make/tinyx.mk
@@ -75,7 +75,7 @@ $(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE) $(DL_DIR)/cross.def $(DL_DIR)
 	cat $(TINYX_PATCH) | patch -d $(TINYX_DIR) -p1
 	cp $(DL_DIR)/host.def $(TINYX_CF)/host.def
 	cp $(DL_DIR)/cross.def $(TINYX_CF)/cross.def
-	perl -i -p -e 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' \
+	sed -ie 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' \
 			$(TINYX_CF)/cross.def \
 			$(TINYX_LDIR)/X11/Xlib.h
 	touch $(TINYX_DIR)/.configure
diff --git a/make/uclibc.mk b/make/uclibc.mk
index 03899b6a8..40e8fd9ce 100644
--- a/make/uclibc.mk
+++ b/make/uclibc.mk
@@ -37,27 +37,27 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
 	touch $(UCLIBC_DIR)/.unpacked
 
 $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(LINUX_DIR)/.configured
-	perl -i -p -e 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(UCLIBC_DIR)/Rules.mak
+	sed -ie 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(UCLIBC_DIR)/Rules.mak
 ifeq ($(ENABLE_LOCALE),true)
 	cp $(SOURCE_DIR)/uClibc.config-locale $(UCLIBC_DIR)/.config
 else
 	cp $(SOURCE_DIR)/uClibc.config $(UCLIBC_DIR)/.config
 endif
-	perl -i -p -e 's,^.*TARGET_$(UCLIBC_TARGET_ARCH).*,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
+	sed -ie 's,^.*TARGET_$(UCLIBC_TARGET_ARCH).*,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
 		$(UCLIBC_DIR)/.config
-	perl -i -p -e 's,^TARGET_ARCH.*,TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' $(UCLIBC_DIR)/.config
-	perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_DIR)\",g' \
+	sed -ie 's,^TARGET_ARCH.*,TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' $(UCLIBC_DIR)/.config
+	sed -ie 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_DIR)\",g' \
 		$(UCLIBC_DIR)/.config
-	perl -i -p -e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' \
+	sed -ie 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' \
 		$(UCLIBC_DIR)/.config
-	perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/usr/\",g' \
+	sed -ie 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/usr/\",g' \
 		$(UCLIBC_DIR)/.config
-	perl -i -p -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
+	sed -ie 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
 		$(UCLIBC_DIR)/.config
-	perl -i -p -e 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g' \
+	sed -ie 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g' \
 		$(UCLIBC_DIR)/.config
 	if [ -n "$(strip $(TARGET_SOFT_FLOAT))" ] ; then \
-		perl -i -p -e 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' \
+		sed -ie 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' \
 			$(UCLIBC_DIR)/.config; \
 	fi
 	$(MAKE) -C $(UCLIBC_DIR) PREFIX=$(STAGING_DIR) headers install_dev;
diff --git a/make/udhcp.mk b/make/udhcp.mk
index 8bd5c9067..50ff49004 100644
--- a/make/udhcp.mk
+++ b/make/udhcp.mk
@@ -44,9 +44,9 @@ $(UDHCP_DIR)/udhcpc: $(UDHCP_DIR)/.unpacked
 	$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(UDHCP_DIR)
 
 $(TARGET_DIR)/sbin/udhcpc: $(UDHCP_DIR)/udhcpc
-	perl -i -p -e 's/pump/udhcpc/' $(TARGET_DIR)/etc/pcmcia/network*
-	perl -i -p -e 's/PUMP/UDHCPC/' $(TARGET_DIR)/etc/pcmcia/network*
-	perl -i -p -e 's/DHCP="n"/DHCP="y"/' $(TARGET_DIR)/etc/pcmcia/network*
+	sed -ie 's/pump/udhcpc/' $(TARGET_DIR)/etc/pcmcia/network*
+	sed -ie 's/PUMP/UDHCPC/' $(TARGET_DIR)/etc/pcmcia/network*
+	sed -ie 's/DHCP="n"/DHCP="y"/' $(TARGET_DIR)/etc/pcmcia/network*
 	mkdir -p $(TARGET_DIR)/sbin
 	rm -f $(TARGET_DIR)/sbin/udhcpc
 	cp $(UDHCP_DIR)/udhcpc $(TARGET_DIR)/sbin/
diff --git a/make/user-mode-linux.mk b/make/user-mode-linux.mk
index f34efe9b4..af4eff2f1 100644
--- a/make/user-mode-linux.mk
+++ b/make/user-mode-linux.mk
@@ -35,7 +35,7 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
 	touch $(LINUX_DIR)/.patched
 
 $(LINUX_DIR)/.set_arch: $(LINUX_DIR)/.patched
-	perl -i -p -e "s/^ARCH :=.*/ARCH:=um/g;" $(LINUX_DIR)/Makefile
+	sed -ie "s/^ARCH :=.*/ARCH:=um/g;" $(LINUX_DIR)/Makefile
 	touch $(LINUX_DIR)/.set_arch
 
 $(LINUX_DIR)/.configured $(BUILD_DIR)/linux/.configured:  $(LINUX_DIR)/.set_arch  $(LINUX_KCONFIG)
diff --git a/make/util-linux.mk b/make/util-linux.mk
index 9c7faef47..a318c47ca 100644
--- a/make/util-linux.mk
+++ b/make/util-linux.mk
@@ -34,9 +34,9 @@ $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
 	);
-	perl -pi -e "s,^INSTALLSUID=.*,INSTALLSUID=\\$$\(INSTALL\) -m \\$$\(BINMODE\)," \
+	sed -ie "s,^INSTALLSUID=.*,INSTALLSUID=\\$$\(INSTALL\) -m \\$$\(BINMODE\)," \
 		$(UTIL-LINUX_DIR)/MCONFIG
-	perl -pi -e "s,^USE_TTY_GROUP=.*,USE_TTY_GROUP=no," $(UTIL-LINUX_DIR)/MCONFIG
+	sed -ie "s,^USE_TTY_GROUP=.*,USE_TTY_GROUP=no," $(UTIL-LINUX_DIR)/MCONFIG
 	touch $(UTIL-LINUX_DIR)/.configured
 
 $(UTIL-LINUX_BINARY): $(UTIL-LINUX_DIR)/.configured