Peter Kjellerstedt writes:

install.patch: * Define $(INSTALL) as install in Rules.mak. * Change all occurrences of install into $(INSTALL). * Change all occurrences of mkdir -p into $(INSTALL) -d. install -d is already used in a number of places so this should not be an additional compatibility problem.
author: Eric Andersen <andersen@codepoet.org> 2003-10-18 10:07:43 +0000
committer: Eric Andersen <andersen@codepoet.org> 2003-10-18 10:07:43 +0000
commit: 49f0dd0fcb64746b1ef06e094f2fa8091c23637c (patch)
tree: 86f964fdcaea6ec3da6036b8f68aff37f4f4dc7b
parent: 1381777907fbd50582e7a5ecd950ca26ca56b26f (diff)
14 files changed, 97 insertions, 95 deletions
diff --git a/Makefile b/Makefile
index 5284c502f..f5e345014 100644
--- a/Makefile
+++ b/Makefile
@@ -94,17 +94,17 @@ finished: shared
 .PHONY: romfs
 romfs:
 	@if [ "$(CONFIG_BINFMT_SHARED_FLAT)" = "y" ]; then \
-		[ -e $(ROMFSDIR)/lib ] || mkdir -p $(ROMFSDIR)/lib; \
+		[ -e $(ROMFSDIR)/lib ] || $(INSTALL) -d $(ROMFSDIR)/lib; \
 		$(ROMFSINST) $(SHARED_TARGET) /lib/lib$(LIBID).so; \
 	fi
 ifeq ($(strip $(HAVE_SHARED)),y)
-	install -d $(ROMFSDIR)/lib
-	install -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+	$(INSTALL) -d $(ROMFSDIR)/lib
+	$(INSTALL) -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 		$(ROMFSDIR)/lib
 	cp -fa lib/*.so.* $(ROMFSDIR)/lib/.
 	@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
 	    set -x -e; \
-	    install -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+	    $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	    		$(ROMFSDIR)/lib; \
 		$(ROMFSINST) -s \
 			/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
@@ -117,7 +117,7 @@ include/bits/uClibc_config.h: .config
 	    make -C extra/config conf; \
 	fi;
 	rm -rf include/bits
-	mkdir -p include/bits
+	$(INSTALL) -d include/bits
 	@./extra/config/conf -o extra/Configs/Config.$(TARGET_ARCH)
 
 headers: include/bits/uClibc_config.h
@@ -191,10 +191,10 @@ install: install_dev install_runtime install_toolchain install_utils finished2
 
 # Installs header files and development library links.
 install_dev:
-	install -d $(PREFIX)$(DEVEL_PREFIX)/lib
-	install -d $(PREFIX)$(DEVEL_PREFIX)/usr/lib
-	install -d $(PREFIX)$(DEVEL_PREFIX)/include
-	-install -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)/lib/
+	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)/lib
+	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)/usr/lib
+	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)/include
+	-$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)/lib/
 	tar -chf - include | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX);
 ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y)
 	# Remove floating point related headers since float support is disabled.
@@ -252,7 +252,7 @@ endif
 	-find $(PREFIX)$(DEVEL_PREFIX) -name CVS | xargs rm -rf;
 	-chown -R `id | sed 's/^uid=\([0-9]*\).*gid=\([0-9]*\).*$$/\1.\2/'` $(PREFIX)$(DEVEL_PREFIX)
 ifeq ($(strip $(HAVE_SHARED)),y)
-	-install -m 644 lib/*.so $(PREFIX)$(DEVEL_PREFIX)/lib/
+	-$(INSTALL) -m 644 lib/*.so $(PREFIX)$(DEVEL_PREFIX)/lib/
 	-find lib/ -type l -name '*.so' -exec cp -fa {} $(PREFIX)$(DEVEL_PREFIX)/lib ';'
 	# If we build shared libraries then the static libs are PIC...
 	# Make _pic.a symlinks to make mklibs.py and similar tools happy.
@@ -267,28 +267,28 @@ endif
 # system, use the "install_target" target instead... 
 install_runtime:
 ifeq ($(strip $(HAVE_SHARED)),y)
-	install -d $(PREFIX)$(DEVEL_PREFIX)/lib
-	install -d $(PREFIX)$(DEVEL_PREFIX)/bin
-	install -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)/lib
+	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)/bin
+	$(INSTALL) -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 		$(PREFIX)$(DEVEL_PREFIX)/lib
 	cp -fa lib/*.so.* $(PREFIX)$(DEVEL_PREFIX)/lib
 	@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
 	    set -x -e; \
-	    install -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+	    $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	    		$(PREFIX)$(DEVEL_PREFIX)/lib; \
 	fi;
 	#@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
-	#    install -d $(PREFIX)$(SHARED_LIB_LOADER_PATH); \
+	#    $(INSTALL) -d $(PREFIX)$(SHARED_LIB_LOADER_PATH); \
 	#    ln -sf $(PREFIX)$(DEVEL_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	#		$(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO); \
 	#fi;
 endif
 
 install_toolchain:
-	install -d $(PREFIX)$(DEVEL_PREFIX)/lib
-	install -d $(PREFIX)$(DEVEL_PREFIX)/bin
-	install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin
-	install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin
+	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)/lib
+	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)/bin
+	$(INSTALL) -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin
+	$(INSTALL) -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin
 	$(MAKE) -C extra/gcc-uClibc install
 
 ifeq ($(strip $(HAVE_SHARED)),y)
@@ -300,21 +300,21 @@ endif
 
 install_utils: utils
 ifeq ($(strip $(HAVE_SHARED)),y)
-	install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin;
-	install -m 755 ldso/util/ldd \
+	$(INSTALL) -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin;
+	$(INSTALL) -m 755 ldso/util/ldd \
 		$(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd
 	ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd \
 		$(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ldd
 	# For now, don't bother with readelf since surely the host
 	# system has binutils, or we couldn't have gotten this far...
-	#install -m 755 ldso/util/readelf \
+	#$(INSTALL) -m 755 ldso/util/readelf \
 	#	$(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf
 	#ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf \
 	#	$(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/readelf
 	@if [ -x ldso/util/ldconfig ] ; then \
 	    set -x -e; \
-	    install -d $(PREFIX)$(DEVEL_PREFIX)/etc; \
-	    install -m 755 ldso/util/ldconfig \
+	    $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)/etc; \
+	    $(INSTALL) -m 755 ldso/util/ldconfig \
 		    $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig; \
 	    ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig \
 		    $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ldconfig; \
@@ -327,18 +327,18 @@ endif
 # deployment onto your target system.
 install_target:
 ifeq ($(strip $(HAVE_SHARED)),y)
-	install -d $(PREFIX)$(TARGET_PREFIX)/lib
-	install -d $(PREFIX)$(TARGET_PREFIX)/usr/bin
-	install -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+	$(INSTALL) -d $(PREFIX)$(TARGET_PREFIX)/lib
+	$(INSTALL) -d $(PREFIX)$(TARGET_PREFIX)/usr/bin
+	$(INSTALL) -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 		$(PREFIX)$(TARGET_PREFIX)/lib
 	cp -fa lib/*.so.* $(PREFIX)$(TARGET_PREFIX)/lib
 	@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
 	    set -x -e; \
-	    install -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+	    $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	    		$(PREFIX)$(TARGET_PREFIX)/lib; \
 	fi;
 	#@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
-	#    install -d $(PREFIX)$(SHARED_LIB_LOADER_PATH); \
+	#    $(INSTALL) -d $(PREFIX)$(SHARED_LIB_LOADER_PATH); \
 	#    ln -sf $(PREFIX)$(TARGET_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	#    		$(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO); \
 	#fi;
@@ -347,17 +347,17 @@ endif
 install_target_utils:
 ifeq ($(strip $(HAVE_SHARED)),y)
 	@$(MAKE) -C ldso/util ldd.target ldconfig.target #readelf.target
-	install -d $(PREFIX)$(TARGET_PREFIX)/etc;
-	install -d $(PREFIX)$(TARGET_PREFIX)/sbin;
-	install -d $(PREFIX)$(TARGET_PREFIX)/usr/bin;
-	install -m 755 ldso/util/ldd.target $(PREFIX)$(TARGET_PREFIX)/usr/bin/ldd
-	install -m 755 ldso/util/ldconfig.target $(PREFIX)$(TARGET_PREFIX)/sbin/ldconfig;
-	#install -m 755 ldso/util/readelf.target $(PREFIX)$(TARGET_PREFIX)/usr/bin/readelf;
+	$(INSTALL) -d $(PREFIX)$(TARGET_PREFIX)/etc;
+	$(INSTALL) -d $(PREFIX)$(TARGET_PREFIX)/sbin;
+	$(INSTALL) -d $(PREFIX)$(TARGET_PREFIX)/usr/bin;
+	$(INSTALL) -m 755 ldso/util/ldd.target $(PREFIX)$(TARGET_PREFIX)/usr/bin/ldd
+	$(INSTALL) -m 755 ldso/util/ldconfig.target $(PREFIX)$(TARGET_PREFIX)/sbin/ldconfig;
+	#$(INSTALL) -m 755 ldso/util/readelf.target $(PREFIX)$(TARGET_PREFIX)/usr/bin/readelf;
 endif
 ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)
 	@$(MAKE) -C libc/misc/wchar iconv.target
-	install -d $(PREFIX)$(TARGET_PREFIX)/usr/bin;
-	install -m 755 libc/misc/wchar/iconv.target $(PREFIX)$(TARGET_PREFIX)/usr/bin/iconv
+	$(INSTALL) -d $(PREFIX)$(TARGET_PREFIX)/usr/bin;
+	$(INSTALL) -m 755 libc/misc/wchar/iconv.target $(PREFIX)$(TARGET_PREFIX)/usr/bin/iconv
 endif
 
 finished2:
@@ -389,37 +389,37 @@ buildmconf:
 
 menuconfig: extra/config/mconf
 	rm -rf include/bits
-	mkdir -p include/bits
+	$(INSTALL) -d include/bits
 	@./extra/config/mconf extra/Configs/Config.$(TARGET_ARCH)
 
 config: extra/config/conf
 	rm -rf include/bits
-	mkdir -p include/bits
+	$(INSTALL) -d include/bits
 	@./extra/config/conf extra/Configs/Config.$(TARGET_ARCH)
 
 oldconfig: extra/config/conf
 	rm -rf include/bits
-	mkdir -p include/bits
+	$(INSTALL) -d include/bits
 	@./extra/config/conf -o extra/Configs/Config.$(TARGET_ARCH)
 
 randconfig: extra/config/conf
 	rm -rf include/bits
-	mkdir -p include/bits
+	$(INSTALL) -d include/bits
 	@./extra/config/conf -r extra/Configs/Config.$(TARGET_ARCH)
 
 allyesconfig: extra/config/conf
 	rm -rf include/bits
-	mkdir -p include/bits
+	$(INSTALL) -d include/bits
 	@./extra/config/conf -y extra/Configs/Config.$(TARGET_ARCH)
 
 allnoconfig: extra/config/conf
 	rm -rf include/bits
-	mkdir -p include/bits
+	$(INSTALL) -d include/bits
 	@./extra/config/conf -n extra/Configs/Config.$(TARGET_ARCH)
 
 defconfig: extra/config/conf
 	rm -rf include/bits
-	mkdir -p include/bits
+	$(INSTALL) -d include/bits
 	@./extra/config/conf -d extra/Configs/Config.$(TARGET_ARCH)
 
 
@@ -461,7 +461,7 @@ distclean: clean
 release: distclean
 	cd ..;					\
 	rm -rf uClibc-$(VERSION);		\
-	cp -fa uClibc uClibc-$(VERSION);		\
+	cp -fa uClibc uClibc-$(VERSION);	\
 	find uClibc-$(VERSION)/ -type f		\
 	    -name .\#* -exec rm -rf {} \; ;	\
 	find uClibc-$(VERSION)/ -type d		\
diff --git a/Rules.mak b/Rules.mak
index 11f114fc7..a2d6d142c 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -43,6 +43,8 @@ LD= $(CROSS)ld
 NM= $(CROSS)nm
 STRIPTOOL= $(CROSS)strip
 
+INSTALL= install
+
 # Select the compiler needed to build binaries for your development system
 HOSTCC=gcc
 HOSTCFLAGS=-O2 -Wall
diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile
index 07193ef14..a37455626 100644
--- a/extra/gcc-uClibc/Makefile
+++ b/extra/gcc-uClibc/Makefile
@@ -61,10 +61,10 @@ $(TARGET_ARCH)-uclibc-ld:	Makefile $(TOPDIR)/.config
 	chmod a+x $@
 
 install:	all
-	install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin;
-	install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin;
-	install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
-	install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
+	$(INSTALL) -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin
+	$(INSTALL) -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin
+	$(INSTALL) -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
+	$(INSTALL) -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
 	ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc
 	ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/gcc
 	ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/cc
diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile
index b8f0e030e..e026fca85 100644
--- a/ldso/ldso/Makefile
+++ b/ldso/ldso/Makefile
@@ -71,8 +71,8 @@ all: lib
 lib:: _dl_progname.h $(OBJS) $(DLINK_OBJS)
 	$(LD) $(LDFLAGS) -e _dl_boot -soname=$(UCLIBC_LDSO) \
 		-o $(LDSO_FULLNAME) $(OBJS) $(LIBGCC);
-	install -d $(TOPDIR)lib 
-	install -m 755 $(LDSO_FULLNAME) $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
+	$(INSTALL) -m 755 $(LDSO_FULLNAME) $(TOPDIR)lib
 	(cd $(TOPDIR)lib && ln -sf $(LDSO_FULLNAME) $(UCLIBC_LDSO))
 
 _dl_progname.h: Makefile
diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile
index 00142a8f2..a0358feea 100644
--- a/ldso/libdl/Makefile
+++ b/ldso/libdl/Makefile
@@ -60,9 +60,9 @@ $(LIBDL): ar-target
 ar-target: $(OBJS) $(PIC_OBJS)
 	$(AR) $(ARFLAGS) $(LIBDL) ../ldso/$(TARGET_ARCH)/resolve.o $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBDL_PIC) $(PIC_OBJS)
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBDL)
-	install -m 644 $(LIBDL) $(TOPDIR)lib
+	$(INSTALL) -m 644 $(LIBDL) $(TOPDIR)lib
 
 
 dlib.o: dlib.c
@@ -80,9 +80,9 @@ shared:
 		-o $(LIBDL_SHARED_FULLNAME) --whole-archive $(LIBDL_PIC) \
 		--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
 		-L$(TOPDIR)/lib -lc;
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED).$(MAJOR_VERSION)
-	install -m 644 $(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib;
+	$(INSTALL) -m 644 $(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib
 	(cd $(TOPDIR)lib && ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED)); 
 	(cd $(TOPDIR)lib && ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED).$(MAJOR_VERSION)); 
 
diff --git a/libc/Makefile b/libc/Makefile
index 06676d486..d7effaaed 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -53,9 +53,9 @@ all: halfclean subdirs $(LIBNAME) $(DO_SHARED)
 
 ar-target:
 	$(CROSS)ranlib $(LIBNAME)
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBNAME)
-	install -m 644 $(LIBNAME) $(TOPDIR)lib
+	$(INSTALL) -m 644 $(LIBNAME) $(TOPDIR)lib
 
 $(LIBNAME): subdirs ar-target
 
@@ -66,9 +66,9 @@ shared: $(TOPDIR)lib/$(LIBNAME) $(LIBGCC_NEED)
 		$(TOPDIR)/libc/misc/internals/interp.o --no-whole-archive \
 		-init __uClibc_init $(LIBGCC)
 	@true #rm -rf tmp
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(SHARED_FULLNAME)
-	install -m 644 $(SHARED_FULLNAME) $(TOPDIR)lib
+	$(INSTALL) -m 644 $(SHARED_FULLNAME) $(TOPDIR)lib
 	(cd ../lib && ln -sf $(SHARED_FULLNAME) libc.so);
 	(cd ../lib && ln -sf $(SHARED_FULLNAME) $(SHARED_MAJORNAME));
 
diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile
index 8bff24f2e..1b51e095a 100644
--- a/libc/sysdeps/linux/common/Makefile
+++ b/libc/sysdeps/linux/common/Makefile
@@ -80,21 +80,21 @@ crti.o: crti.S
 	$(CC) $(SAFECFLAGS) -c crti.S -o crti.o
 
 $(TOPDIR)lib/crti.o: crti.o
-	mkdir -p $(TOPDIR)lib/
+	$(INSTALL) -d $(TOPDIR)lib/
 	cp crti.o $(TOPDIR)lib/
 
 crtn.o: crtn.S
 	$(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o
 
 $(TOPDIR)lib/crtn.o: crtn.o
-	mkdir -p $(TOPDIR)lib/
+	$(INSTALL) -d $(TOPDIR)lib/
 	cp crtn.o $(TOPDIR)lib/
 else
 $(TOPDIR)lib/crti.o:
-	mkdir -p $(TOPDIR)lib/
+	$(INSTALL) -d $(TOPDIR)lib/
 	$(AR) $(ARFLAGS) $(TOPDIR)lib/crti.o
 $(TOPDIR)lib/crtn.o:
-	mkdir -p $(TOPDIR)lib/
+	$(INSTALL) -d $(TOPDIR)lib/
 	$(AR) $(ARFLAGS) $(TOPDIR)lib/crtn.o
 endif
 
diff --git a/libcrypt/Makefile b/libcrypt/Makefile
index 9cb0f751b..f745f1047 100644
--- a/libcrypt/Makefile
+++ b/libcrypt/Makefile
@@ -37,9 +37,9 @@ $(LIBCRYPT): ar-target
 
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBCRYPT) $(OBJS)
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBCRYPT)
-	install -m 644 $(LIBCRYPT) $(TOPDIR)lib
+	$(INSTALL) -m 644 $(LIBCRYPT) $(TOPDIR)lib
 
 $(OBJS): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -52,9 +52,9 @@ shared: all
 		-o $(LIBCRYPT_SHARED_FULLNAME) --whole-archive $(LIBCRYPT) \
 		--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
 		-L$(TOPDIR)/lib -lc;
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION)
-	install -m 644 $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib;
+	$(INSTALL) -m 644 $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib;
 	(cd $(TOPDIR)lib && ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED)); 
 	(cd $(TOPDIR)lib && ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED).$(MAJOR_VERSION)); 
 
diff --git a/libintl/Makefile b/libintl/Makefile
index ccc8098f3..ab148ba02 100644
--- a/libintl/Makefile
+++ b/libintl/Makefile
@@ -42,9 +42,9 @@ $(LIBC): ar-target
 
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBINTL) $(OBJS)
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBINTL)
-	install -m 644 $(LIBINTL) $(TOPDIR)lib/
+	$(INSTALL) -m 644 $(LIBINTL) $(TOPDIR)lib/
 
 $(MOBJ): $(MSRC)
 	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
@@ -55,9 +55,9 @@ shared: all
 		-o $(LIBINTL_SHARED_FULLNAME) --whole-archive $(LIBINTL) \
 		--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
 		-L$(TOPDIR)/lib -lc;
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED).$(MAJOR_VERSION)
-	install -m 644 $(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/;
+	$(INSTALL) -m 644 $(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib
 	(cd $(TOPDIR)lib && ln -sf $(LIBINTL_SHARED_FULLNAME) $(LIBINTL_SHARED)); 
 	(cd $(TOPDIR)lib && ln -sf $(LIBINTL_SHARED_FULLNAME) $(LIBINTL_SHARED).$(MAJOR_VERSION)); 
 
diff --git a/libm/Makefile b/libm/Makefile
index 8dfc20d0e..200faf33e 100644
--- a/libm/Makefile
+++ b/libm/Makefile
@@ -88,9 +88,9 @@ endif
 $(LIBM): ar-target
 	@if [ -f $(LIBM) ] ; then \
 		set -x -e; \
-		install -d $(TOPDIR)lib; \
+		$(INSTALL) -d $(TOPDIR)lib; \
 		rm -f $(TOPDIR)lib/$(LIBM); \
-		install -m 644 $(LIBM) $(TOPDIR)lib; \
+		$(INSTALL) -m 644 $(LIBM) $(TOPDIR)lib; \
 	fi;
 
 shared: all
@@ -100,9 +100,9 @@ shared: all
 		-o $(LIBM_SHARED_FULLNAME) --whole-archive $(LIBM) \
 		--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
 		-L$(TOPDIR)/lib -lc; \
-	    install -d $(TOPDIR)lib; \
+	    $(INSTALL) -d $(TOPDIR)lib; \
 	    rm -f $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
-	    install -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \
+	    $(INSTALL) -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \
 	    (cd $(TOPDIR)lib && ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED)); \
 	    (cd $(TOPDIR)lib && ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED).$(MAJOR_VERSION)); \
 	fi;
diff --git a/libnsl/Makefile b/libnsl/Makefile
index 5f90e0c2b..37ac9eb09 100644
--- a/libnsl/Makefile
+++ b/libnsl/Makefile
@@ -32,9 +32,9 @@ $(LIBNSL): ar-target
 
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBNSL) $(OBJS)
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBNSL)
-	install -m 644 $(LIBNSL) $(TOPDIR)lib
+	$(INSTALL) -m 644 $(LIBNSL) $(TOPDIR)lib
 
 $(OBJS): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -47,9 +47,9 @@ shared: all
 		-o $(LIBNSL_SHARED_FULLNAME) --whole-archive $(LIBNSL) \
 		--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
 		-L$(TOPDIR)/lib -lc;
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBNSL_SHARED).$(MAJOR_VERSION)
-	install -m 644 $(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib;
+	$(INSTALL) -m 644 $(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib
 	(cd $(TOPDIR)lib && ln -sf $(LIBNSL_SHARED_FULLNAME) $(LIBNSL_SHARED)); 
 	(cd $(TOPDIR)lib && ln -sf $(LIBNSL_SHARED_FULLNAME) $(LIBNSL_SHARED).$(MAJOR_VERSION)); 
 
diff --git a/libpthread/Makefile b/libpthread/Makefile
index 85fc357d0..b2b1c3481 100644
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -55,17 +55,17 @@ all: $(LIBPTHREAD) $(LIBTHREAD_DB)
 $(LIBPTHREAD): subdirs
 	@if [ -f $(LIBPTHREAD) ] ; then \
 		set -e; \
-		install -d $(TOPDIR)lib; \
+		$(INSTALL) -d $(TOPDIR)lib; \
 		rm -f $(TOPDIR)lib/$(LIBPTHREAD); \
-		install -m 644 $(LIBPTHREAD) $(TOPDIR)lib; \
+		$(INSTALL) -m 644 $(LIBPTHREAD) $(TOPDIR)lib; \
 	fi;
 
 $(LIBTHREAD_DB): subdirs
 	@if [ -f $(LIBTHREAD_DB) ] ; then \
 		set -e; \
-		install -d $(TOPDIR)lib; \
+		$(INSTALL) -d $(TOPDIR)lib; \
 		rm -f $(TOPDIR)lib/$(LIBTHREAD_DB); \
-		install -m 644 $(LIBTHREAD_DB) $(TOPDIR)lib; \
+		$(INSTALL) -m 644 $(LIBTHREAD_DB) $(TOPDIR)lib; \
 	fi;
 
 
@@ -82,10 +82,10 @@ shared: all
 			-o $(LIBPTHREAD_SHARED_FULLNAME) $(START_FILES) --whole-archive $(LIBPTHREAD) \
 			--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
 			-L$(TOPDIR)/lib -lc $(END_FILES); \
-		install -d $(TOPDIR)lib; \
+		$(INSTALL) -d $(TOPDIR)lib; \
 		rm -f $(TOPDIR)lib/$(LIBPTHREAD_SHARED_FULLNAME) \
 			$(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \
-		install -m 644 $(LIBPTHREAD_SHARED_FULLNAME) $(TOPDIR)lib; \
+		$(INSTALL) -m 644 $(LIBPTHREAD_SHARED_FULLNAME) $(TOPDIR)lib; \
 		(cd $(TOPDIR)lib && ln -sf $(LIBPTHREAD_SHARED_FULLNAME) \
 			$(LIBPTHREAD_SHARED)); \
 		(cd $(TOPDIR)lib && ln -sf $(LIBPTHREAD_SHARED_FULLNAME) \
@@ -97,10 +97,10 @@ shared: all
 			-o $(LIBTHREAD_DB_SHARED_FULLNAME) $(START_FILES) --whole-archive $(LIBTHREAD_DB) \
 			--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
 			-L$(TOPDIR)/lib -lc $(END_FILES); \
-		install -d $(TOPDIR)lib; \
+		$(INSTALL) -d $(TOPDIR)lib; \
 		rm -f $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED_FULLNAME) \
 			$(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).$(MAJOR_VERSION); \
-		install -m 644 $(LIBTHREAD_DB_SHARED_FULLNAME) $(TOPDIR)lib; \
+		$(INSTALL) -m 644 $(LIBTHREAD_DB_SHARED_FULLNAME) $(TOPDIR)lib; \
 		(cd $(TOPDIR)lib && ln -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \
 			$(LIBTHREAD_DB_SHARED)); \
 		(cd $(TOPDIR)lib && ln -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \
diff --git a/libresolv/Makefile b/libresolv/Makefile
index 767ea2786..98e7166cb 100644
--- a/libresolv/Makefile
+++ b/libresolv/Makefile
@@ -38,9 +38,9 @@ $(LIBRESOLV): ar-target
 
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBRESOLV) $(OBJS)
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBRESOLV)
-	install -m 644 $(LIBRESOLV) $(TOPDIR)lib
+	$(INSTALL) -m 644 $(LIBRESOLV) $(TOPDIR)lib
 
 $(OBJS): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -53,9 +53,9 @@ shared: all
 		-o $(LIBRESOLV_SHARED_FULLNAME) --whole-archive $(LIBRESOLV) \
 		--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
 		-L$(TOPDIR)/lib -lc;
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBRESOLV_SHARED).$(MAJOR_VERSION)
-	install -m 644 $(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib;
+	$(INSTALL) -m 644 $(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib
 	(cd $(TOPDIR)lib && ln -sf $(LIBRESOLV_SHARED_FULLNAME) $(LIBRESOLV_SHARED)); 
 	(cd $(TOPDIR)lib && ln -sf $(LIBRESOLV_SHARED_FULLNAME) $(LIBRESOLV_SHARED).$(MAJOR_VERSION)); 
 
diff --git a/libutil/Makefile b/libutil/Makefile
index e3126e055..b149b0e64 100644
--- a/libutil/Makefile
+++ b/libutil/Makefile
@@ -41,9 +41,9 @@ $(LIBC): ar-target
 
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBUTIL) $(OBJS)
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBUTIL)
-	install -m 644 $(LIBUTIL) $(TOPDIR)lib/
+	$(INSTALL) -m 644 $(LIBUTIL) $(TOPDIR)lib/
 
 $(OBJS): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -54,9 +54,9 @@ shared: all
 		-o $(LIBUTIL_SHARED_FULLNAME) --whole-archive $(LIBUTIL) \
 		--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
 		-L$(TOPDIR)/lib -lc;
-	install -d $(TOPDIR)lib
+	$(INSTALL) -d $(TOPDIR)lib
 	rm -f $(TOPDIR)lib/$(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED).$(MAJOR_VERSION)
-	install -m 644 $(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/;
+	$(INSTALL) -m 644 $(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib
 	(cd $(TOPDIR)lib && ln -sf $(LIBUTIL_SHARED_FULLNAME) $(LIBUTIL_SHARED)); 
 	(cd $(TOPDIR)lib && ln -sf $(LIBUTIL_SHARED_FULLNAME) $(LIBUTIL_SHARED).$(MAJOR_VERSION));
author	Eric Andersen <andersen@codepoet.org>	2003-10-18 10:07:43 +0000
committer	Eric Andersen <andersen@codepoet.org>	2003-10-18 10:07:43 +0000
commit	49f0dd0fcb64746b1ef06e094f2fa8091c23637c (patch)
tree	86f964fdcaea6ec3da6036b8f68aff37f4f4dc7b
parent	1381777907fbd50582e7a5ecd950ca26ca56b26f (diff)