[Libreoffice-commits] .: moz/zipped

[Caolán McNamara]

 moz/zipped/makefile.mk |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1097edc1e2275e8453829b1959c53ffe9d1343f9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 4 11:34:28 2011 +0000

    We always either build nss or use the system one
    
    We always either build nss or use the system one, so there isn't a case where
    we want to bundle the ancient nss in the pre-builds

diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk
index 36469cb..0f1fe2c 100644
--- a/moz/zipped/makefile.mk
+++ b/moz/zipped/makefile.mk
@@ -97,7 +97,7 @@ LIBLIST =
 BIN_RUNTIMELIST = 
 NSS_INCLUDE_LIST =
 NSS_MODULE_RUNTIME_LIST =
-.IF "$(ENABLE_NSS_MODULE)"=="YES"
+
 # The prebuilt moz files include all the old NSS stuff from moz and not the new
 # NSS libs, headers, etc, from the separate nss module. If we use the nss module
 # then we must take care not to deliver the old NSS stuff from the "prebuilts"
@@ -187,8 +187,6 @@ NSS_MODULE_RUNTIME_LIST:= \
     sqlite/sqlite3 \
     ssl3
 
-
-.ENDIF #.IF "$(ENABLE_NSS_MODULE)"=="YES"
 # Remove the nss libs build in moz and those build in the nss module
 $(MISC)$/replace_old_nss_libs : $(MISC)$/unpacked_$(TARGET)_lib \
 $(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip