From ff23ecf6698ed48d18a612aadf1fbae64a47b207 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 18 Oct 2003 10:51:06 +0000 Subject: Peter Kjellerstedt writes: ln.patch: * Define $(LN) as ln in Rules.mak. * Change all occurrences of ln into $(LN). * Change all constructs like (cd path && ln -sf foo/file file) into $(LN) -sf foo/file path/file. The latter construct is already used in a number of places so it should not be an additional compatibility problem. --- Makefile | 31 ++++++++++++++----------------- Rules.mak | 1 + extra/gcc-uClibc/Makefile | 20 ++++++++++---------- ldso/Makefile | 8 ++++---- ldso/ldso/Makefile | 2 +- ldso/libdl/Makefile | 4 ++-- ldso/util/Makefile | 2 +- libc/Makefile | 4 ++-- libc/misc/locale/Makefile | 2 +- libc/sysdeps/linux/alpha/Makefile | 4 +--- libc/sysdeps/linux/arm/Makefile | 4 +--- libc/sysdeps/linux/common/Makefile | 3 +-- libc/sysdeps/linux/i386/Makefile | 5 ++--- libc/sysdeps/linux/m68k/Makefile | 6 ++---- libc/sysdeps/linux/mips/Makefile | 7 +++---- libc/sysdeps/linux/powerpc/Makefile | 3 +-- libc/sysdeps/linux/sh/Makefile | 3 +-- libc/sysdeps/linux/sparc/Makefile | 3 +-- libcrypt/Makefile | 4 ++-- libintl/Makefile | 4 ++-- libm/Makefile | 4 ++-- libnsl/Makefile | 4 ++-- libpthread/Makefile | 16 ++++++++-------- libresolv/Makefile | 4 ++-- libutil/Makefile | 4 ++-- 25 files changed, 69 insertions(+), 83 deletions(-) diff --git a/Makefile b/Makefile index d698dd7de..51327deaa 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ bogus $(SHARED_TARGET): lib/libc.a lib/main.o Makefile -L __CTOR_LIST__ -L __DTOR_LIST__ \ -L _current_shared_library_a5_offset_ \ $(SHARED_TARGET).gdb - ln -sf $(SHARED_TARGET).gdb . + $(LN) -sf $(SHARED_TARGET).gdb . endif finished: shared @@ -127,31 +127,28 @@ else @./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) -n endif @if [ "$(TARGET_ARCH)" = "mipsel" ]; then \ - (cd libc/sysdeps/linux; \ - ln -fs mips mipsel); \ - (cd ldso/ldso; \ - ln -fs mips mipsel); \ - (cd libpthread/linuxthreads/sysdeps; \ - ln -fs mips mipsel); \ + $(LN) -fs mips libc/sysdeps/linux/mipsel; \ + $(LN) -fs mips ldso/ldso/mipsel; \ + $(LN) -fs mips libpthread/linuxthreads/sysdeps/mipsel; \ fi; @cd include/bits; \ set -e; \ for i in `ls ../../libc/sysdeps/linux/common/bits/*.h` ; do \ - ln -fs $$i .; \ + $(LN) -fs $$i .; \ done; \ if [ -d ../../libc/sysdeps/linux/$(TARGET_ARCH)/bits ] ; then \ for i in `ls ../../libc/sysdeps/linux/$(TARGET_ARCH)/bits/*.h` ; do \ - ln -fs $$i .; \ + $(LN) -fs $$i .; \ done; \ fi @cd include/sys; \ set -e; \ for i in `ls ../../libc/sysdeps/linux/common/sys/*.h` ; do \ - ln -fs $$i .; \ + $(LN) -fs $$i .; \ done; \ if [ -d ../../libc/sysdeps/linux/$(TARGET_ARCH)/sys ] ; then \ for i in `ls ../../libc/sysdeps/linux/$(TARGET_ARCH)/sys/*.h` ; do \ - ln -fs $$i .; \ + $(LN) -fs $$i .; \ done; \ fi @cd $(TOPDIR); \ @@ -257,7 +254,7 @@ ifeq ($(strip $(HAVE_SHARED)),y) # If we build shared libraries then the static libs are PIC... # Make _pic.a symlinks to make mklibs.py and similar tools happy. for i in `find lib/ -type f -name '*.a' | sed -e 's/lib\///'` ; do \ - ln -sf $$i $(PREFIX)$(DEVEL_PREFIX)/lib/`echo $$i | sed -e 's/\.a$$/_pic.a/'`; \ + $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)/lib/`echo $$i | sed -e 's/\.a$$/_pic.a/'`; \ done endif @@ -279,7 +276,7 @@ ifeq ($(strip $(HAVE_SHARED)),y) fi; #@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \ # $(INSTALL) -d $(PREFIX)$(SHARED_LIB_LOADER_PATH); \ - # ln -sf $(PREFIX)$(DEVEL_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \ + # $(LN) -sf $(PREFIX)$(DEVEL_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \ # $(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO); \ #fi; endif @@ -303,20 +300,20 @@ ifeq ($(strip $(HAVE_SHARED)),y) $(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 \ + $(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 \ # $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf - #ln -fs $(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 \ $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig; \ - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig \ + $(LN) -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig \ $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ldconfig; \ fi; endif @@ -339,7 +336,7 @@ ifeq ($(strip $(HAVE_SHARED)),y) fi; #@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \ # $(INSTALL) -d $(PREFIX)$(SHARED_LIB_LOADER_PATH); \ - # ln -sf $(PREFIX)$(TARGET_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \ + # $(LN) -sf $(PREFIX)$(TARGET_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \ # $(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO); \ #fi; endif diff --git a/Rules.mak b/Rules.mak index 96ba134e4..7d27d7664 100644 --- a/Rules.mak +++ b/Rules.mak @@ -44,6 +44,7 @@ NM= $(CROSS)nm STRIPTOOL= $(CROSS)strip INSTALL= install +LN= ln RM= rm -f # Select the compiler needed to build binaries for your development system diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile index bbe17cc99..3fc1769e7 100644 --- a/extra/gcc-uClibc/Makefile +++ b/extra/gcc-uClibc/Makefile @@ -65,22 +65,22 @@ install: all $(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 - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ld + $(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 + $(LN) -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ld ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++ - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++ - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/c++ - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/g++ + $(LN) -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++ + $(LN) -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++ + $(LN) -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/c++ + $(LN) -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/g++ endif for app in addr2line ar as cpp gasp nm objcopy \ objdump ranlib size strings strip; do \ APPNAME=`which $(CROSS)$${app} 2>/dev/null`; \ if [ -x "$$APPNAME" ] ; then \ - ln -fs "$$APPNAME" $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/$${app}; \ - ln -fs "$$APPNAME" $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \ + $(LN) -fs "$$APPNAME" $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/$${app}; \ + $(LN) -fs "$$APPNAME" $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \ fi; \ done diff --git a/ldso/Makefile b/ldso/Makefile index 44a4456ca..d4e16ec91 100644 --- a/ldso/Makefile +++ b/ldso/Makefile @@ -44,10 +44,10 @@ utils: $(MAKE) -C util; headers: - ln -fs $(TOPDIR)../include/elf.h include/ - ln -fs ../ldso/$(TARGET_ARCH)/boot1_arch.h include/ - ln -fs ../ldso/$(TARGET_ARCH)/ld_syscalls.h include/ - ln -fs ../ldso/$(TARGET_ARCH)/ld_sysdep.h include/ + $(LN) -fs $(TOPDIR)../include/elf.h include/ + $(LN) -fs ../ldso/$(TARGET_ARCH)/boot1_arch.h include/ + $(LN) -fs ../ldso/$(TARGET_ARCH)/ld_syscalls.h include/ + $(LN) -fs ../ldso/$(TARGET_ARCH)/ld_sysdep.h include/ clean: set -e ; for d in $(ALL_SUBDIRS) ; do $(MAKE) -C $$d $@ ; done diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile index 80dd8c020..2f0674d23 100644 --- a/ldso/ldso/Makefile +++ b/ldso/ldso/Makefile @@ -74,7 +74,7 @@ lib:: _dl_progname.h $(OBJS) $(DLINK_OBJS) -o $(LDSO_FULLNAME) $(OBJS) $(LIBGCC); $(INSTALL) -d $(TOPDIR)lib $(INSTALL) -m 755 $(LDSO_FULLNAME) $(TOPDIR)lib - (cd $(TOPDIR)lib && ln -sf $(LDSO_FULLNAME) $(UCLIBC_LDSO)) + $(LN) -sf $(LDSO_FULLNAME) $(TOPDIR)lib/$(UCLIBC_LDSO) _dl_progname.h: Makefile echo "const char *_dl_progname=\""$(UCLIBC_LDSO)"\";" > _dl_progname.h diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile index 3152b3162..009072131 100644 --- a/ldso/libdl/Makefile +++ b/ldso/libdl/Makefile @@ -83,8 +83,8 @@ shared: $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED).$(MAJOR_VERSION) $(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)); + $(LN) -sf $(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED) + $(LN) -sf $(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED).$(MAJOR_VERSION) clean: $(RM) .depend $(LIBDL_SHARED)* $(LIBDL_SHARED_FULLNAME) core *.o *.a *.s *.i tmp_make foo *~ diff --git a/ldso/util/Makefile b/ldso/util/Makefile index 06de2df7e..9064c367b 100644 --- a/ldso/util/Makefile +++ b/ldso/util/Makefile @@ -39,7 +39,7 @@ endif all: $(TARGETS) headers: - ln -fs $(TOPDIR)include/elf.h + $(LN) -fs $(TOPDIR)include/elf.h readelf: readelf.c $(HOSTCC) $(HOSTCFLAGS) -I. -I../include $^ -o $@ diff --git a/libc/Makefile b/libc/Makefile index a03d15277..f93b07da9 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -69,8 +69,8 @@ shared: $(TOPDIR)lib/$(LIBNAME) $(LIBGCC_NEED) $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(SHARED_FULLNAME) $(INSTALL) -m 644 $(SHARED_FULLNAME) $(TOPDIR)lib - (cd ../lib && ln -sf $(SHARED_FULLNAME) libc.so); - (cd ../lib && ln -sf $(SHARED_FULLNAME) $(SHARED_MAJORNAME)); + $(LN) -sf $(SHARED_FULLNAME) $(TOPDIR)lib/libc.so + $(LN) -sf $(SHARED_FULLNAME) $(TOPDIR)lib/$(SHARED_MAJORNAME) $(LIBGCC_NEED): $(TOPDIR)lib/$(LIBNAME) @$(RM) -r tmp diff --git a/libc/misc/locale/Makefile b/libc/misc/locale/Makefile index 752f0aa0f..75fa56a78 100644 --- a/libc/misc/locale/Makefile +++ b/libc/misc/locale/Makefile @@ -60,7 +60,7 @@ $(MOBJx): $(MSRC) $(STRIPTOOL) -x -R .note -R .comment $*.o locale_data.o: - ln -sf ../../../extra/locale/locale_data.c + $(LN) -sf ../../../extra/locale/locale_data.c $(CC) $(CFLAGS) -c -D__WCHAR_ENABLED -I../../../extra/locale locale_data.c -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o diff --git a/libc/sysdeps/linux/alpha/Makefile b/libc/sysdeps/linux/alpha/Makefile index f71a40376..59a8ccaa9 100644 --- a/libc/sysdeps/linux/alpha/Makefile +++ b/libc/sysdeps/linux/alpha/Makefile @@ -54,10 +54,8 @@ $(COBJS): %.o : %.c $(STRIPTOOL) -x -R .note -R .comment $*.o headers: - cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/alpha/fpu_control.h . - + $(LN) -fs ../libc/sysdeps/linux/alpha/fpu_control.h $(TOPDIR)/include/ clean: $(RM) *.[oa] *~ core $(RM) bits/sysnum.h - diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile index 532b55035..a31f6a704 100644 --- a/libc/sysdeps/linux/arm/Makefile +++ b/libc/sysdeps/linux/arm/Makefile @@ -62,10 +62,8 @@ gcrt1.o: $(CRT0_DEPS) endif headers: - cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/arm/fpu_control.h . - + $(LN) -fs ../libc/sysdeps/linux/arm/fpu_control.h $(TOPDIR)/include/ clean: $(RM) *.[oa] *~ core $(RM) bits/sysnum.h - diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile index 1edfe7bf4..30d27f0a3 100644 --- a/libc/sysdeps/linux/common/Makefile +++ b/libc/sysdeps/linux/common/Makefile @@ -99,8 +99,7 @@ $(TOPDIR)lib/crtn.o: endif headers: - cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/common/fpu_control.h . + $(LN) -fs ../libc/sysdeps/linux/common/fpu_control.h $(TOPDIR)/include/ clean: $(RM) *.[oa] *~ core crt[in].* *.S - diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile index 75e7a27b7..90cad8e6e 100644 --- a/libc/sysdeps/linux/i386/Makefile +++ b/libc/sysdeps/linux/i386/Makefile @@ -65,10 +65,9 @@ gcrt1.o: $(CRT0_DEPS) endif headers: - cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/i386/fpu_control.h . - + $(LN) -fs ../libc/sysdeps/linux/i386/fpu_control.h $(TOPDIR)/include/ clean: $(RM) *.[oa] *~ core $(RM) bits/sysnum.h - + $(RM) $(TOPDIR)/include/fpu_control.h diff --git a/libc/sysdeps/linux/m68k/Makefile b/libc/sysdeps/linux/m68k/Makefile index 321dcf7b3..5c8d3e381 100644 --- a/libc/sysdeps/linux/m68k/Makefile +++ b/libc/sysdeps/linux/m68k/Makefile @@ -63,10 +63,9 @@ $(COBJS): %.o : %.c headers: ifneq ($(strip $(HAVE_ELF)),y) echo "Working around compiler bug in the m68k-pic-coff toolchain" - cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/m68k/float.h . + $(LN) -fs ../libc/sysdeps/linux/m68k/float.h $(TOPDIR)/include/ endif - cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/m68k/fpu_control.h . - + $(LN) -fs ../libc/sysdeps/linux/m68k/fpu_control.h $(TOPDIR)/include/ clean: $(RM) *.[oa] *~ core @@ -74,4 +73,3 @@ clean: ifneq ($(strip $(HAVE_ELF)),y) $(RM) $(TOPDIR)/include/float.h endif - diff --git a/libc/sysdeps/linux/mips/Makefile b/libc/sysdeps/linux/mips/Makefile index 361746c28..e3630039f 100644 --- a/libc/sysdeps/linux/mips/Makefile +++ b/libc/sysdeps/linux/mips/Makefile @@ -53,12 +53,11 @@ $(COBJS): %.o : %.c $(STRIPTOOL) -x -R .note -R .comment $*.o headers: - cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/mips/sgidefs.h . -# cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/mips/regdef.h . - cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/mips/fpu_control.h . + $(LN) -fs ../libc/sysdeps/linux/mips/sgidefs.h $(TOPDIR)/include/ +# $(LN) -fs ../libc/sysdeps/linux/mips/regdef.h $(TOPDIR)/include/ + $(LN) -fs ../libc/sysdeps/linux/mips/fpu_control.h $(TOPDIR)/include/ clean: $(RM) *.[oa] *~ core $(RM) bits/sysnum.h $(RM) $(TOPDIR)/include/sgidefs.h - diff --git a/libc/sysdeps/linux/powerpc/Makefile b/libc/sysdeps/linux/powerpc/Makefile index 380bd778b..39432a0ef 100644 --- a/libc/sysdeps/linux/powerpc/Makefile +++ b/libc/sysdeps/linux/powerpc/Makefile @@ -65,9 +65,8 @@ gcrt1.o: $(CRT0_DEPS) endif headers: - cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/powerpc/fpu_control.h . + $(LN) -fs ../libc/sysdeps/linux/powerpc/fpu_control.h $(TOPDIR)/include/ clean: $(RM) *.[oa] *~ core $(RM) bits/sysnum.h - diff --git a/libc/sysdeps/linux/sh/Makefile b/libc/sysdeps/linux/sh/Makefile index 99ccaaa75..d730a4b0f 100644 --- a/libc/sysdeps/linux/sh/Makefile +++ b/libc/sysdeps/linux/sh/Makefile @@ -64,9 +64,8 @@ gcrt1.o: $(CRT0_DEPS) endif headers: - cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/sh/fpu_control.h . + $(LN) -fs ../libc/sysdeps/linux/sh/fpu_control.h $(TOPDIR)/include/ clean: $(RM) *.[oa] *~ core $(RM) bits/sysnum.h - diff --git a/libc/sysdeps/linux/sparc/Makefile b/libc/sysdeps/linux/sparc/Makefile index abee5e47d..ecbfb4b70 100644 --- a/libc/sysdeps/linux/sparc/Makefile +++ b/libc/sysdeps/linux/sparc/Makefile @@ -55,9 +55,8 @@ $(COBJS): %.o : %.c $(STRIPTOOL) -x -R .note -R .comment $*.o headers: - cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/sparc/fpu_control.h . + $(LN) -fs ../libc/sysdeps/linux/sparc/fpu_control.h $(TOPDIR)/include/ clean: $(RM) *.[oa] *~ core $(RM) bits/sysnum.h - diff --git a/libcrypt/Makefile b/libcrypt/Makefile index 30b1e1d94..aae3b03c6 100644 --- a/libcrypt/Makefile +++ b/libcrypt/Makefile @@ -55,8 +55,8 @@ shared: all $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION) $(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)); + $(LN) -sf $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED) + $(LN) -sf $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION) clean: $(RM) *.[oa] *~ core $(LIBCRYPT_SHARED)* $(LIBCRYPT_SHARED_FULLNAME)* diff --git a/libintl/Makefile b/libintl/Makefile index efc48a7ce..1036fbf64 100644 --- a/libintl/Makefile +++ b/libintl/Makefile @@ -58,8 +58,8 @@ shared: all $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED).$(MAJOR_VERSION) $(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)); + $(LN) -sf $(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED) + $(LN) -sf $(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED).$(MAJOR_VERSION) clean: $(RM) *.[oa] *~ core $(LIBINTL_SHARED)* $(LIBINTL_SHARED_FULLNAME)* diff --git a/libm/Makefile b/libm/Makefile index e864f597e..dad2286d2 100644 --- a/libm/Makefile +++ b/libm/Makefile @@ -103,8 +103,8 @@ shared: all $(INSTALL) -d $(TOPDIR)lib; \ $(RM) $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \ $(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)); \ + $(LN) -sf $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED); \ + $(LN) -sf $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \ fi; ar-target: $(OBJS) diff --git a/libnsl/Makefile b/libnsl/Makefile index 920da032a..7566c2dfd 100644 --- a/libnsl/Makefile +++ b/libnsl/Makefile @@ -50,8 +50,8 @@ shared: all $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBNSL_SHARED).$(MAJOR_VERSION) $(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)); + $(LN) -sf $(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBNSL_SHARED) + $(LN) -sf $(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBNSL_SHARED).$(MAJOR_VERSION) clean: $(RM) *.[oa] *~ core $(LIBNSL_SHARED)* $(LIBNSL_SHARED_FULLNAME)* diff --git a/libpthread/Makefile b/libpthread/Makefile index a12655b48..9fe3759dd 100644 --- a/libpthread/Makefile +++ b/libpthread/Makefile @@ -86,10 +86,10 @@ shared: all $(RM) $(TOPDIR)lib/$(LIBPTHREAD_SHARED_FULLNAME) \ $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \ $(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) \ - $(LIBPTHREAD_SHARED).$(MAJOR_VERSION)); \ + $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ + $(TOPDIR)lib/$(LIBPTHREAD_SHARED); \ + $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \ + $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \ fi; if [ -f $(LIBTHREAD_DB) ] ; then \ set -e; \ @@ -101,10 +101,10 @@ shared: all $(RM) $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED_FULLNAME) \ $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).$(MAJOR_VERSION); \ $(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) \ - $(LIBTHREAD_DB_SHARED).1); \ + $(LN) -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \ + $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED); \ + $(LN) -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \ + $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).1; \ fi; tags: diff --git a/libresolv/Makefile b/libresolv/Makefile index 8658842ce..deb375f23 100644 --- a/libresolv/Makefile +++ b/libresolv/Makefile @@ -56,8 +56,8 @@ shared: all $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBRESOLV_SHARED).$(MAJOR_VERSION) $(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)); + $(LN) -sf $(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBRESOLV_SHARED) + $(LN) -sf $(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBRESOLV_SHARED).$(MAJOR_VERSION) clean: $(RM) *.[oa] *~ core $(LIBRESOLV_SHARED)* $(LIBRESOLV_SHARED_FULLNAME)* diff --git a/libutil/Makefile b/libutil/Makefile index 572ca0aa8..5698fc6ef 100644 --- a/libutil/Makefile +++ b/libutil/Makefile @@ -57,8 +57,8 @@ shared: all $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED).$(MAJOR_VERSION) $(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)); + $(LN) -sf $(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED) + $(LN) -sf $(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED).$(MAJOR_VERSION) clean: $(RM) *.[oa] *~ core $(LIBUTIL_SHARED)* $(LIBUTIL_SHARED_FULLNAME)* -- cgit v1.2.3