Change 'sed -ie' to 'sed -i -e' to avoid littering the build

with lots of unwanted backup files with the letter "e" appended.
 -Erik

diff --git a/make/bash.mk b/make/bash.mk
index aca345232e29611723b93e7638dc0a73b4094a56..8aa236ecaf98297316ef7aaeb81c69187f7bcf80 100644 (file)
--- 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
-       sed -ie 's,LIBS_FOR_BUILD =.*,LIBS_FOR_BUILD =,g' \
+       sed -i -e '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 dc4bb255807b2524dd89f6a35425263bb995a096..ca546d2d0667a1817b28e9b084a13699162647aa 100644 (file)
--- a/make/berkeleydb.mk
+++ b/make/berkeleydb.mk
@@ -43,7 +43,7 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
                --disable-compat185 \
                --with-pic \
        );
-       sed -ie 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile
+       sed -i -e '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 fcd6e234a0da5e8fd287b42865576ce8e1249ab1..e0a5058ced44ddd7a30e8c2ee0ff32126574b3b5 100644 (file)
--- a/make/busybox.mk
+++ b/make/busybox.mk
@@ -28,20 +28,20 @@ $(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
-       sed -ie "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
+       sed -i -e "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
                PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak
 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
-       sed -ie "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
+       sed -i -e "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
 else
-       sed -ie "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
+       sed -i -e "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(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
-       sed -ie "s,^CROSS.*,CROSS=$(TARGET_CROSS),;" $(BUSYBOX_DIR)/Makefile
-       sed -ie "s,^PREFIX.*,PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Makefile
+       sed -i -e "s,^CROSS.*,CROSS=$(TARGET_CROSS),;" $(BUSYBOX_DIR)/Makefile
+       sed -i -e "s,^PREFIX.*,PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Makefile
 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
-       sed -ie "s/^DOLFS.*/DOLFS=true/;" $(BUSYBOX_DIR)/Makefile
+       sed -i -e "s/^DOLFS.*/DOLFS=true/;" $(BUSYBOX_DIR)/Makefile
 endif
 endif
        touch $(BUSYBOX_DIR)/.configured

diff --git a/make/bzip2.mk b/make/bzip2.mk
index 967360e19c3fe232d367d4c744ce6c49a1dc29e0..f2e21e93ffde3e599ddb6912bddd589a8bf1c14a 100644 (file)
--- 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 -
-       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" \
+       sed -i -e "s,ln \$$(,ln -sf \$$(,g" $(BZIP2_DIR)/Makefile
+       sed -i -e "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 cc5c6cc773df12e74542c30e6ef7608c924d661d..33cd847e4237f834976ae368b91b307730e9e367 100644 (file)
--- a/make/coreutils.mk
+++ b/make/coreutils.mk
@@ -46,10 +46,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
-       sed -ie 's,.*UTILS_OPEN_MAX.*,#define UTILS_OPEN_MAX 1019,g' \
+       sed -i -e 's,.*UTILS_OPEN_MAX.*,#define UTILS_OPEN_MAX 1019,g' \
                $(COREUTILS_DIR)/config.h
        # This is undefined when crosscompiling...
-       sed -ie 's,.*HAVE_PROC_UPTIME.*,#define HAVE_PROC_UPTIME 1,g' \
+       sed -i -e 's,.*HAVE_PROC_UPTIME.*,#define HAVE_PROC_UPTIME 1,g' \
                $(COREUTILS_DIR)/config.h
        touch  $(COREUTILS_DIR)/.configured
 

diff --git a/make/customize.mk b/make/customize.mk
index 2cfed18345e7dfd775961c772957d5878e25099a..817fe878a09b635d74d401be95e543529e16d56f 100644 (file)
--- a/make/customize.mk
+++ b/make/customize.mk
@@ -3,8 +3,19 @@
 # Any custom stuff you feel like doing....
 #
 #############################################################
-CUST_DIR:=$(SOURCE_DIR)/customize
+CUST_DIR:=$(BASE_DIR)/Erik-Router
 ROOT_DIR:=$(BUILD_DIR)/root
 
 customize:
-       cp -af $(CUST_DIR)/* $(ROOT_DIR)/
+       cp $(CUST_DIR)/ext2root.mk $(BASE_DIR)/make/
+       cp $(CUST_DIR)/interfaces $(ROOT_DIR)/etc/network/
+       cp $(CUST_DIR)/eth* $(ROOT_DIR)/etc/network/
+       chmod a+x $(ROOT_DIR)/etc/network/eth*
+       cp $(CUST_DIR)/inittab $(ROOT_DIR)/etc/
+       cp $(CUST_DIR)/vtun* $(ROOT_DIR)/etc/
+       cp $(CUST_DIR)/udhcp* $(ROOT_DIR)/etc/
+       cp $(CUST_DIR)/shadow $(ROOT_DIR)/etc/
+       cp $(CUST_DIR)/wireless $(ROOT_DIR)/etc/pcmcia/
+       cp $(CUST_DIR)/resolv.conf $(ROOT_DIR)/etc/
+       cp $(CUST_DIR)/ssh_host* $(ROOT_DIR)/etc/
+       chmod go-r $(ROOT_DIR)/etc/ssh_host*

diff --git a/make/fakeroot.mk b/make/fakeroot.mk
index c0b37771506d79b53f074073ab7755adf2a2f789..2922b75f65ff9036b7f4ffb952ebeb5b28dad187 100644 (file)
--- 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.
-       sed -ie "s,getopt --version,getopt --version 2>/dev/null," \
+       sed -i -e "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 5a0413740f946c8ef90b7d7d1d8ba7605af3104f..8e1621c22e9435456bec2318327a0a386a8b353b 100644 (file)
--- 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 \
-               sed -ie "s,-dynamic-linker.*\.so[\.0-9]*},\
+               sed -i -e "s,-dynamic-linker.*\.so[\.0-9]*},\
                    -dynamic-linker /lib/ld-uClibc.so.0},;" $$LIST; fi);
        #
        # Prevent system glibc start files from leaking in uninvited...
        #
-       sed -ie "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 =\
+       sed -i -e "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 =\
                \"$(STAGING_DIR)/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
-       sed -ie "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 =\
+       sed -i -e "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...
        #
-       sed -ie "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=\
+       sed -i -e "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=\
                $(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
-       sed -ie "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=\
+       sed -i -e "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=\
                $(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
-       sed -ie "s,^#define.*STANDARD_INCLUDE_DIR.*,#define STANDARD_INCLUDE_DIR \
+       sed -i -e "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...
        #
-       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
+       sed -i -e "s,\"/lib,\"$(STAGING_DIR)/lib,g;" $(GCC_DIR)/gcc/collect2.c
+       sed -i -e "s,\"/usr/,\"$(STAGING_DIR)/usr/,g;" $(GCC_DIR)/gcc/collect2.c
        #
        # Prevent gcc from using the unwind-dw2-fde-glibc code
        #
-       sed -ie "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
+       sed -i -e "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
        #
-       sed -ie "s,int flag_use_cxa_atexit = 1;,int flag_use_cxa_atexit = 0;,g;"\
+       sed -i -e "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 572115642b400dc372a3a70dfe7584bf31c29b8c..b55235121923063c226609131133140651a1eefb 100644 (file)
--- 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 \
-               sed -ie "s,-dynamic-linker.*\.so[\.0-9]*},\
+               sed -i -e "s,-dynamic-linker.*\.so[\.0-9]*},\
                    -dynamic-linker /lib/ld-uClibc.so.0},;" $$LIST; fi);
        #
        # Prevent system glibc start files from leaking in uninvited...
        #
-       sed -ie "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 =\
+       sed -i -e "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 =\
                \"$(STAGING_DIR)/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
-       sed -ie "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 =\
+       sed -i -e "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...
        #
-       sed -ie "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=\
+       sed -i -e "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=\
                $(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
-       sed -ie "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=\
+       sed -i -e "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=\
                $(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
-       sed -ie "s,^#define.*STANDARD_INCLUDE_DIR.*,#define STANDARD_INCLUDE_DIR \
+       sed -i -e "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...
        #
-       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
+       sed -i -e "s,\"/lib,\"$(STAGING_DIR)/lib,g;" $(GCC_DIR)/gcc/collect2.c
+       sed -i -e "s,\"/usr/,\"$(STAGING_DIR)/usr/,g;" $(GCC_DIR)/gcc/collect2.c
        #
        # Prevent gcc from using the unwind-dw2-fde-glibc code
        #
-       sed -ie "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
+       sed -i -e "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++
        # 
-       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;" \
+       sed -i -e "s,\.so\.1,.so.0.9.9,g;" $(GCC_DIR)/gcc/config/t-slibgcc-elf-ver;
+       sed -i -e "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;
-       sed -ie "s,3\.0\.0,9.9.0,g;" $(GCC_DIR)/libstdc++-v3/acinclude.m4 \
+       sed -i -e "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 \
-               sed -ie "s,-dynamic-linker.*\.so[\.0-9]*},\
+               sed -i -e "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
        #
-       sed -ie "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
+       sed -i -e "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++
        # 
-       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;" \
+       sed -i -e "s,\.so\.1,.so.0.9.9,g;" $(GCC_BUILD_DIR3)/gcc/config/t-slibgcc-elf-ver;
+       sed -i -e "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;
-       sed -ie "s,3\.0\.0,9.9.0,g;" $(GCC_BUILD_DIR3)/libstdc++-v3/acinclude.m4 \
+       sed -i -e "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
-       sed -ie "s/^1/0/;" $(TARGET_DIR)/usr/lib/gcc-lib/$(ARCH)-linux/$(GCC_VERSION)/specs
+       sed -i -e "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 7bbab76e2871834897fbc981a6e5699369ebdcdb..932f17d4a4eaaf8c8d87d04dd767f95e8c2517ab 100644 (file)
--- 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)
-       -sed -ie "s,^INTL *=.*,INTL = -lintl,g;" $(GDB_DIR)/gdb/Makefile
+       -sed -i -e "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 e2c49f7d950ad3f730e85def7b4cf37dc177886e..bc33393e471fb03e4858b687afe05fe5800d5b51 100644 (file)
--- 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
-       sed -ie "s,/.*#define PRISM2_DOWNLOAD_SUPPORT.*/,#define PRISM2_DOWNLOAD_SUPPORT,g" \
+       sed -i -e "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 a048393b622096dbf3462ffee721b4b9b4857012..9819fdbad53570b76ab06c8064c7068946e020bc 100644 (file)
--- 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
-       sed -ie "s,-I/usr/include/db3,," $(IPROUTE2_DIR)/Makefile
-       sed -ie "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
+       sed -i -e "s,-I/usr/include/db3,," $(IPROUTE2_DIR)/Makefile
+       sed -i -e "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
                $(IPROUTE2_DIR)/Makefile
-       sed -ie "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
+       sed -i -e "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 
-       sed -ie "s, misc,," $(IPROUTE2_DIR)/Makefile
+       sed -i -e "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 95be69fae51185d677bdae00009e29c9aaa76639..1fe0e7f438f9733ac96f975c2c769df282213722 100644 (file)
--- 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
-       sed -ie "s@shell.*YES.*@shell grep -q '__UCLIBC_HAS_IPV6__.*1' \
+       sed -i -e "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 77f1a37696eb1df7d001f1580fb3e6152db7752f..47f23aaf4a96679e9b4dcf50bfd5939bf1690220 100644 (file)
--- 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
-       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
+       sed -i -e "s,^CC.*,CC=\"/usr/bin/gcc\"," $(TARGET_DIR)/usr/bin/libtool
+       sed -i -e "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 fe44d703a8514f2c766c744c5dfd3a4676baaf4e..39caf81341267f119736e920218d3186d88b0f3b 100644 (file)
--- 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)
-       sed -ie "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
+       sed -i -e "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 dce1391d73cdce9344b945e976045093817b4cae..ce261acf63a602497586854ce72bb8ff32f9eb31 100644 (file)
--- a/make/lrzsz.mk
+++ b/make/lrzsz.mk
@@ -54,8 +54,8 @@ $(LRZSZ_DIR)/.configured: $(LRZSZ_DIR)/.unpacked
                $(DISABLE_NLS) \
                --disable-timesync \
        );
-       sed -ie "s/-lnsl//;" $(LRZSZ_DIR)/src/Makefile
-       sed -ie "s~(#define ENABLE_SYSLOG.*)~/* \1 */~;" $(LRZSZ_DIR)/config.h
+       sed -i -e "s/-lnsl//;" $(LRZSZ_DIR)/src/Makefile
+       sed -i -e "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 8c33173e731594306471065b4be7da349f57fd9a..9c1e662e2d2b7ccdb2b1c9333b5beb7a0d35a459 100644 (file)
--- 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
-       sed -ie 's~gcc~${TARGET_CC}~' $(MICROCOM_DIR)/Makefile
+       sed -i -e '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 6c32bbda012fec6962a695f8234275b30b82a087..03f60a8e5d7f83cf31e90d483aa6fd9f24b6e6b3 100644 (file)
--- 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.30 2003/11/13 06:02:19 andersen Exp $
+# $Id: ncurses.mk,v 1.31 2003/11/18 07:18:25 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.
-       sed -ie 's~\$$srcdir/shlib tic\$$suffix~/usr/bin/tic~' \
+       sed -i -e '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 7db429957f47f1a54af4e2d06576b0961b059f91..248240ebe9b3612038313faf73ce960c168f2e22 100644 (file)
--- 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
-       sed -ie "s/main\(\)/main(void)/;" $(NETKITBASE_DIR)/configure
+       sed -i -e "s/main\(\)/main(void)/;" $(NETKITBASE_DIR)/configure
        # don't try to run cross compiled binaries while configuring things
-       sed -ie "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure
+       sed -i -e "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/
-       sed -ie "s/^([a-z])/#\1/;" $(TARGET_DIR)/etc/inetd.conf
+       sed -i -e "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 6b4b129dacdfdf2149bb929666d13e3275be7d79..64af064070149898f67d87da34968d356ff71c2e 100644 (file)
--- 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
-       sed -ie "s/main\(\)/main(void)/;" $(NETKITTELNET_DIR)/configure
+       sed -i -e "s/main\(\)/main(void)/;" $(NETKITTELNET_DIR)/configure
        # Disable termcap support
-       sed -ie "s~(.*termcap\.h.*)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c
+       sed -i -e "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
-       sed -ie "s~^#telnet.*~telnet\tstream\ttcp\tnowait\troot\t/usr/sbin/telnetd\t/usr/sbin/telnetd~;" $(TARGET_DIR)/etc/inetd.conf
+       sed -i -e "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 4b213339e5c32c48063250ea1a59b2bc737eedcd..a13e99b55f1f8f6a45ab4957a9ecdd8a3b985ea2 100644 (file)
--- 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 -
-       sed -ie "s,^#if.*__GLIBC__.*_BSD_SOURCE.*$$,#if 0," \
+       sed -i -e "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 0d2fe309b7ae5a793adf1d0f1ed4e24993342b35..50d3cf6bbae1628ba216624ac232b89906760ed0 100644 (file)
--- 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.
-       sed -ie 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \
+       sed -i -e '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 3c40485df3d435fe4300e47cb29bd456493b2be6..3508bc067b68685d2f3d4ddd4829e92ba44e6cb5 100644 (file)
--- 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))
-       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
+       sed -i -e "s/pump/udhcpc/" $(PCMCIA_DIR)/etc/network
+       sed -i -e "s/ide_cs/ide-cs/" $(PCMCIA_DIR)/etc/config
+       sed -i -e "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 ffda6d16d450cca5438ba18622a2263feedd358c..3a9223c8016c5981475ec266291e6ca896011799 100644 (file)
--- 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)
-       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
+       sed -i -e "s,^ARCH.*,ARCH=$(ARCH)," $(PERL_DIR)/cross/config
+       sed -i -e "s,^CONFIG_TARGET_.*,\#," $(PERL_DIR)/cross/config
+       sed -i -e "s,^export CROSS=.*,export CROSS=$(TARGET_CROSS)," $(PERL_DIR)/cross/Makefile
+       sed -i -e "s,TARGET_ARCH,$(ARCH)," $(PERL_DIR)/cross/config.sh.uclibc
+       sed -i -e "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 f023fb38ee6b5350498053433f6b554e53b742f7..cf25ac8bead023bc08970c41cc7f3c7b056e483a 100644 (file)
--- 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 -
-       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
+       sed -i -e 's/ -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP//' $(PPPD_DIR)/pppd/Makefile.linux
+       sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' $(PPPD_DIR)/*/Makefile.linux
+       sed -i -e 's/ -o root//' $(PPPD_DIR)/*/Makefile.linux
+       sed -i -e '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 690dcd602e206fd7ca5f7a9ad675fa4d293bd9fc..82faddc50b58d2a0e85796db992733fcff2f848f 100644 (file)
--- a/make/tinylogin.mk
+++ b/make/tinylogin.mk
@@ -24,12 +24,12 @@ tinylogin-source: $(DL_DIR)/$(TINYLOGIN_SOURCE)
 
 $(TINYLOGIN_DIR)/Config.h: $(DL_DIR)/$(TINYLOGIN_SOURCE)
        bzcat $(DL_DIR)/$(TINYLOGIN_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-       sed -ie "s/\`id -u\` -ne 0/0 == 1/" \
+       sed -i -e "s/\`id -u\` -ne 0/0 == 1/" \
                $(TINYLOGIN_DIR)/install.sh
-       sed -ie "s/4755 --owner=root --group=root/755/" \
+       sed -i -e "s/4755 --owner=root --group=root/755/" \
                $(TINYLOGIN_DIR)/install.sh
-       sed -ie "s/^DOSTATIC.*/DOSTATIC=false/g;" $(TINYLOGIN_DIR)/Makefile
-       sed -ie "s/^DODEBUG.*/DODEBUG=false/g;" $(TINYLOGIN_DIR)/Makefile
+       sed -i -e "s/^DOSTATIC.*/DOSTATIC=false/g;" $(TINYLOGIN_DIR)/Makefile
+       sed -i -e "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 984f6fa9a29b43aeba827573027df9bcc079b7f8..4bbe26648479a53288749f2a28b368ad7a85ce3c 100644 (file)
--- 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
-       sed -ie 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' \
+       sed -i -e '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 4c4bc855c219822869819828bd8b5db6d72e9207..faf6de9db045d8fd9a6275bb5d38f4181bdaebb0 100644 (file)
--- a/make/uclibc.mk
+++ b/make/uclibc.mk
@@ -37,33 +37,33 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
        touch $(UCLIBC_DIR)/.unpacked
 
 $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(LINUX_DIR)/.configured
-       sed -ie 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(UCLIBC_DIR)/Rules.mak
+       sed -i -e '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
-       sed -ie 's,^.*TARGET_$(UCLIBC_TARGET_ARCH).*,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
+       sed -i -e 's,^.*TARGET_$(UCLIBC_TARGET_ARCH).*,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
                $(UCLIBC_DIR)/.config
-       sed -ie 's,^TARGET_ARCH.*,TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' $(UCLIBC_DIR)/.config
-       sed -ie 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_DIR)\",g' \
+       sed -i -e 's,^TARGET_ARCH.*,TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' $(UCLIBC_DIR)/.config
+       sed -i -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_DIR)\",g' \
                $(UCLIBC_DIR)/.config
-       sed -ie 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' \
+       sed -i -e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' \
                $(UCLIBC_DIR)/.config
-       sed -ie 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/usr/\",g' \
+       sed -i -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/usr/\",g' \
                $(UCLIBC_DIR)/.config
-       sed -ie 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
+       sed -i -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
                $(UCLIBC_DIR)/.config
 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
-       sed -ie "s/^.*UCLIBC_HAS_LFS.*/UCLIBC_HAS_LFS=y/;" \
+       sed -i -e "s/^.*UCLIBC_HAS_LFS.*/UCLIBC_HAS_LFS=y/;" \
                $(UCLIBC_DIR)/.config
 else
-       sed -ie "s/^.*UCLIBC_HAS_LFS.*/UCLIBC_HAS_LFS=n/;" \
+       sed -i -e "s/^.*UCLIBC_HAS_LFS.*/UCLIBC_HAS_LFS=n/;" \
                $(UCLIBC_DIR)/.config
 endif
-       sed -ie 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config
+       sed -i -e 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config
        if [ -n "$(strip $(TARGET_SOFT_FLOAT))" ] ; then \
-               sed -ie 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' \
+               sed -i -e '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 50ff4900477a4b37d3717bcfbb673e1c238cd630..d92dd5c2b8ab4b7295824929ed7992c32a84e4f5 100644 (file)
--- 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
-       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*
+       sed -i -e 's/pump/udhcpc/' $(TARGET_DIR)/etc/pcmcia/network*
+       sed -i -e 's/PUMP/UDHCPC/' $(TARGET_DIR)/etc/pcmcia/network*
+       sed -i -e '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 af4eff2f199bed8b137bf4e03b97f50b873284e9..1572cefb925aef3c0083727c81934504747c3d17 100644 (file)
--- 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
-       sed -ie "s/^ARCH :=.*/ARCH:=um/g;" $(LINUX_DIR)/Makefile
+       sed -i -e "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 a318c47caf52e1b69e39304ff64de952da3f73e1..48dd32d1fb628b73b14b0b52fc41b0e6414f30a8 100644 (file)
--- 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) \
        );
-       sed -ie "s,^INSTALLSUID=.*,INSTALLSUID=\\$$\(INSTALL\) -m \\$$\(BINMODE\)," \
+       sed -i -e "s,^INSTALLSUID=.*,INSTALLSUID=\\$$\(INSTALL\) -m \\$$\(BINMODE\)," \
                $(UTIL-LINUX_DIR)/MCONFIG
-       sed -ie "s,^USE_TTY_GROUP=.*,USE_TTY_GROUP=no," $(UTIL-LINUX_DIR)/MCONFIG
+       sed -i -e "s,^USE_TTY_GROUP=.*,USE_TTY_GROUP=no," $(UTIL-LINUX_DIR)/MCONFIG
        touch $(UTIL-LINUX_DIR)/.configured
 
 $(UTIL-LINUX_BINARY): $(UTIL-LINUX_DIR)/.configured