From 77dbb4c9f3630f1f641e932c5cf30c5d2af93c2f Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 11 Feb 2009 11:03:30 +0100 Subject: [PATCH] s3:build: some implementations of "ln" are picky about the order or arguments Michael (cherry picked from commit fe30a4abe24f8aceb9966b250c55ad2e3b4ffc82) --- source/Makefile.in | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/source/Makefile.in b/source/Makefile.in index 054919a44a8..7a30c044034 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1560,7 +1560,7 @@ $(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLO $(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME) @rm -f $@ - @ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@ + @ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@ $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0) @echo Linking non-shared library $@ @@ -1580,7 +1580,7 @@ installlibtalloc:: installdirs libtalloc -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` -if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \ - ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \ + ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \ $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \ fi -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR) @@ -1626,7 +1626,7 @@ $(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS) $(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_SONAME) @rm -f $@ - @ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@ + @ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@ $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0) @echo Linking non-shared library $@ @@ -1647,7 +1647,7 @@ installlibtdb:: installdirs libtdb -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` -if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \ - ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` \ + ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` \ $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \ fi -$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR) @@ -1700,7 +1700,7 @@ $(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBW $(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME) @rm -f $@ - @ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@ + @ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@ $(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ) @echo Linking non-shared library $@ @@ -1720,7 +1720,7 @@ installlibwbclient:: installdirs libwbclient -$(INSTALLLIBCMD_SH) $(LIBWBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` -if test -r $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \ - ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \ + ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \ $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \ fi @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include @@ -1761,7 +1761,7 @@ $(LIBADDNS_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_S $(LIBADDNS_SHARED_TARGET): $(LIBADDNS_SHARED_TARGET_SONAME) @rm -f $@ - @ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@ + @ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@ $(LIBADDNS_STATIC_TARGET): $(BINARY_PREREQS) $(LIBADDNS_OBJ0) @echo Linking non-shared library $@ @@ -1780,7 +1780,7 @@ installlibaddns:: installdirs libaddns -$(INSTALLLIBCMD_SH) $(LIBADDNS_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` -if test -r $(LIBADDNS_SHARED_TARGET_SONAME) ; then \ - ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \ + ln -f -s `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \ $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \ fi -$(INSTALLLIBCMD_A) $(LIBADDNS_STATIC_TARGET) $(DESTDIR)$(LIBDIR) @@ -1840,7 +1840,7 @@ $(LIBNETAPI_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAP $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME) @rm -f $@ - @ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@ + @ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@ $(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0) @echo Linking non-shared library $@ @@ -1860,7 +1860,7 @@ installlibnetapi:: installdirs libnetapi -$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` -if test -r $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \ - ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \ + ln -f -s `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \ $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \ fi -$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR) @@ -1921,7 +1921,7 @@ installlibsmbclient:: installdirs libsmbclient -$(INSTALLLIBCMD_SH) $(LIBSMBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` -if test -r $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \ - ln -s -f `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \ + ln -f -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \ $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \ fi -$(INSTALLLIBCMD_A) $(LIBSMBCLIENT_STATIC_TARGET) $(DESTDIR)$(LIBDIR) @@ -1973,7 +1973,7 @@ $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_O $(LIBSMBSHAREMODES_SHARED_TARGET): $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) @rm -f $@ - @ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@ + @ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@ $(LIBSMBSHAREMODES_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0) @echo Linking non-shared library $@ @@ -1992,7 +1992,7 @@ installlibsmbsharemodes:: installdirs libsmbsharemodes -$(INSTALLLIBCMD_SH) $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` -if test -r $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \ - ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \ + ln -f -s `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \ $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \ fi -$(INSTALLLIBCMD_A) $(LIBSMBSHAREMODES_STATIC_TARGET) $(DESTDIR)$(LIBDIR) -- 2.11.4.GIT