From d520f85b09c11753ff6d709a00d253710304f9cd Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 11 Feb 2009 11:02:05 +0100 Subject: s3:build: some implementations of "ln" are picky about the order of arguments Michael --- source3/Makefile.in | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'source3') diff --git a/source3/Makefile.in b/source3/Makefile.in index 03463e9cd2..2d2d9a0c6d 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1649,7 +1649,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 $@ @@ -1669,7 +1669,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) @@ -1715,7 +1715,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 $@ @@ -1736,7 +1736,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) @@ -1790,7 +1790,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 $@ @@ -1810,7 +1810,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 @@ -1851,7 +1851,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 $@ @@ -1870,7 +1870,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) @@ -1937,7 +1937,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 $@ @@ -1957,7 +1957,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) @@ -2021,7 +2021,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) @@ -2074,7 +2074,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 $@ @@ -2093,7 +2093,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) @@ -2171,7 +2171,7 @@ $(LIBLUA_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBLUA_OBJ) $(LIBLUA_SYMS) @ $(LIBLUA_SHARED_TARGET): $(LIBLUA_SHARED_TARGET_SONAME) @rm -f $@ - @ln -s -f `basename $(LIBLUA_SHARED_TARGET_SONAME)` $@ + @ln -f -s `basename $(LIBLUA_SHARED_TARGET_SONAME)` $@ $(LIBLUA_STATIC_TARGET): $(BINARY_PREREQS) $(LIBLUA_OBJ0) @echo Linking non-shared library $@ @@ -2190,7 +2190,7 @@ installliblua:: installdirs liblua -$(INSTALLLIBCMD_SH) $(LIBLUA_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_SHARED_TARGET)` -if test -e $(LIBLUA_SHARED_TARGET_SONAME) ; then \ - ln -s -f `basename $(LIBLUA_SHARED_TARGET_SONAME)` \ + ln -f -s `basename $(LIBLUA_SHARED_TARGET_SONAME)` \ $(DESTDIR)$(LIBDIR)/`basename $(LIBLUA_SHARED_TARGET)` ; \ fi -$(INSTALLLIBCMD_A) $(LIBLUA_STATIC_TARGET) $(DESTDIR)$(LIBDIR) -- cgit