diff options
Diffstat (limited to 'editors/openoffice-1.0/files/patch-stlport+makefile.mk')
-rw-r--r-- | editors/openoffice-1.0/files/patch-stlport+makefile.mk | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/editors/openoffice-1.0/files/patch-stlport+makefile.mk b/editors/openoffice-1.0/files/patch-stlport+makefile.mk index c55d863..70ec58c 100644 --- a/editors/openoffice-1.0/files/patch-stlport+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stlport+makefile.mk @@ -1,32 +1,36 @@ ---- ../stlport/makefile.mk.orig Tue Mar 19 15:49:17 2002 -+++ ../stlport/makefile.mk Tue May 28 23:03:45 2002 -@@ -106,11 +106,29 @@ +--- ../stlport/makefile.mk.orig Tue Jan 7 13:13:37 2003 ++++ ../stlport/makefile.mk Sat Jan 18 13:01:53 2003 +@@ -98,16 +98,28 @@ .IF "$(COM)"=="GCC" .IF "$(COMID)"=="gcc3" -+ -+.IF "$(OS)"=="FREEBSD" -+BUILD_FLAGS=-f gcc-3.0-freebsd.mak +-BUILD_FLAGS=-f gcc-3.0.mak ++.IF # "$(OS)"=="FREEBSD" ++ BUILD_FLAGS=-f gcc-3.0-freebsd.mak +.ELSE - BUILD_FLAGS=-f gcc-3.0.mak ++ BUILD_FLAGS=-f gcc-3.0.mak +.ENDIF -+ .ELSE # "$(COMID)"=="gcc3" -+ -+.IF "$(OS)"=="FREEBSD" -+BUILD_FLAGS=-f gcc-freebsd.mak +-# MacOS X/Darwin need a special makefile ++# FreeBSD / MacOS X/Darwin need a special makefile + .IF "$(OS)"=="MACOSX" + BUILD_FLAGS=-f gcc-apple-macosx.mak +-.ELSE # "$(OS)"=="MACOSX" ++.ELSIF # "$(OS)"=="FREEBSD" ++ BUILD_FLAGS=-f gcc-freebsd.mak +.ELSE - BUILD_FLAGS=-f gcc.mak -+.ENDIF -+ + BUILD_FLAGS=-f gcc.mak +-.ENDIF # "$(OS)"=="MACOSX" ++.ENDIF # "$(OS)"=="MACOSX || $(OS)"=="FREEBSD" .ENDIF # "$(COMID)"=="gcc3" +-BUILD_ACTION=make + +.IF "$(OS)"=="FREEBSD" -+BUILD_ACTION=gmake ++ BUILD_ACTION=gmake +.ELSE - BUILD_ACTION=make ++ BUILD_ACTION=make +.ENDIF + + # build in parallel + BUILD_FLAGS+= -j$(MAXPROCESS) .ENDIF - - .IF "$(COM)"=="C52" |