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.

11 files changed, 16 insertions, 28 deletions

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
-