You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by js...@apache.org on 2011/12/08 18:10:15 UTC

svn commit: r1211986 - /incubator/ooo/trunk/main/moz/zipped/makefile.mk

Author: jsc
Date: Thu Dec  8 17:10:15 2011
New Revision: 1211986

URL: http://svn.apache.org/viewvc?rev=1211986&view=rev
Log:
fix to solve build problems on MacOS in moz, when --disable-build-mozilla is used, means prebuild moz libs

Modified:
    incubator/ooo/trunk/main/moz/zipped/makefile.mk

Modified: incubator/ooo/trunk/main/moz/zipped/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/moz/zipped/makefile.mk?rev=1211986&r1=1211985&r2=1211986&view=diff
==============================================================================
--- incubator/ooo/trunk/main/moz/zipped/makefile.mk (original)
+++ incubator/ooo/trunk/main/moz/zipped/makefile.mk Thu Dec  8 17:10:15 2011
@@ -154,8 +154,10 @@ LIBLIST= \
 .ENDIF # .IF "$(GUI)"=="WNT"
 
 
+# On MacOS no include dirs nspr and nss exists in the prebuilt zip, no need to remove them 
+.IF "$(OS)" != "MACOSX" 
 NSS_INCLUDE_LIST= nspr nss
-
+.ENDIF
 
 .IF "$(OS)" == "SOLARIS" 
 .IF "$(CPU)" == "S" #32bit