diff options
Diffstat (limited to 'editors/openoffice.org-3/files/patch-product+util+makefile.mk')
| -rw-r--r-- | editors/openoffice.org-3/files/patch-product+util+makefile.mk | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/editors/openoffice.org-3/files/patch-product+util+makefile.mk b/editors/openoffice.org-3/files/patch-product+util+makefile.mk index e52b0a4ea6ef..cb6f306e19b1 100644 --- a/editors/openoffice.org-3/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-3/files/patch-product+util+makefile.mk @@ -1,6 +1,6 @@ ---- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 -+++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 -@@ -137,13 +137,6 @@ +--- ../product/util/makefile.mk.orig Wed Oct 2 21:24:25 2002 ++++ ../product/util/makefile.mk Mon Oct 21 14:26:10 2002 +@@ -131,13 +131,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -8,27 +8,37 @@ -ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ -- $(DESTDIRDLL)$/libstdc++.so.3 \ -- $(DESTDIRDLL)$/libstdc++.so.3.0.1 +- $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) \ +- $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) -.ENDIF .ELIF "$(OS)"=="NETBSD" ########### @@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 + # special targets for linux gcc3 + .IF "$(COMID)"=="gcc3" ++.IF "$(OS)"!="FREEBSD" -+.IF "$(OS)"=="LINUX" - .IF "$(CCNUMVER)">="000300010000" + $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) : + $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT) +@@ -511,7 +505,9 @@ + -rm -f $@ + +ln -s libstdc++.so.$(LIBSTDCPP3) $@ + .ENDIF ++.ENDIF + ++.IF "$(OS)"!="FREEBSD" + $(DLLOUT)$/libgcc_s.so.1 : + $(GCCINSTLIB) libgcc_s.so.1 $(DLLOUT) + +@@ -521,7 +517,8 @@ - $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ - +ln -s libgcc_s.so.1 $@ -+ +- +ln -s libgcc_s.so.1 $@ ++ +ln -fs libgcc_s.so.1 $@ +.ENDIF -+ #------------------------------------------------------------- $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) |