diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-03-10 22:34:53 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-03-10 22:34:53 +0000 |
| commit | 39bdece24e5320ba93a1d397ff4f5aea653873df (patch) | |
| tree | 329c13d020f98fc99c73b034fa5b2bd6eade9e9f /editors/openoffice.org-2-RC/files/patch-product::util::makefile.mk | |
| parent | A getpwuid_r function is now implemented in patch-sal::osl::unx::system.c (diff) | |
Add -f to ln to continue builds
Notes
Notes:
svn path=/head/; revision=55832
Diffstat (limited to 'editors/openoffice.org-2-RC/files/patch-product::util::makefile.mk')
| -rw-r--r-- | editors/openoffice.org-2-RC/files/patch-product::util::makefile.mk | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/editors/openoffice.org-2-RC/files/patch-product::util::makefile.mk b/editors/openoffice.org-2-RC/files/patch-product::util::makefile.mk index 0d2033b9a4b2..919c2b2e2fad 100644 --- a/editors/openoffice.org-2-RC/files/patch-product::util::makefile.mk +++ b/editors/openoffice.org-2-RC/files/patch-product::util::makefile.mk @@ -1,8 +1,8 @@ ---- ../product/util/makefile.mk.orig Sat Mar 2 22:13:11 2002 -+++ ../product/util/makefile.mk Sat Mar 2 22:14:13 2002 -@@ -111,6 +111,15 @@ +--- ../product/util/makefile.mk.orig Mon Dec 17 18:15:54 2001 ++++ ../product/util/makefile.mk Sun Mar 10 23:18:09 2002 +@@ -117,6 +117,15 @@ + STLPORTLIBNAME=stlport_vc6.dll ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/stlport_vc6.dll \ $(DESTDIRDLL)$/w9xucwrp.dll +.ELIF "$(OS)"=="FREEBSD" +########### @@ -15,8 +15,8 @@ +BINDINGDLL=gcc2_uno .ENDIF - .IF "$(STLPORTLIBNAME)" != "" -@@ -360,8 +369,8 @@ + STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME) +@@ -373,8 +382,8 @@ $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) @@ -25,5 +25,23 @@ + +ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ + +ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) + + #--------------------------------------------------------- +@@ -385,7 +394,7 @@ + + $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) + -rm -f $@ +- +ln -s libstdc++.so.3.0.1 $@ ++ +ln -fs libstdc++.so.3.0.1 $@ + + $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) + -rm -f $@ +@@ -393,7 +402,7 @@ + + $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) + -rm -f $@ +- +ln -s libgcc_s.so.1 $@ ++ +ln -fs libgcc_s.so.1 $@ + #------------------------------------------------------------- + $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) - $(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ |