[Libreoffice-commits] .: nss/makefile.mk

[Christian Lohmaier]

 nss/makefile.mk |   62 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

New commits:
commit 7cfb7a449765e774d24dd242629d5742dc87d675
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Jan 4 18:09:44 2012 +0100

    get rid of obsolete pathdelimiter escape

diff --git a/nss/makefile.mk b/nss/makefile.mk
index bc7b827..dbb5f07 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -38,7 +38,7 @@ TARGET=nss
 
 .IF "$(SYSTEM_NSS)"=="YES"
 all:
-    @echo "NSS will not be built. Using system one instead."
+	@echo "NSS will not be built. Using system one instead."
 .ENDIF	
 
 VER_MAJOR=3
@@ -91,11 +91,11 @@ MACOS_SDK_DIR*=$(MACDEVSDK)
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ENDIF # "$(OS)"=="MACOSX"
 
-OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST) mozilla$/dist$/out$/lib$/libcrmf.a
+OUT2LIB=mozilla/dist/out/lib/*$(DLLPOST) mozilla/dist/out/lib/libcrmf.a
 
-OUT2BIN=config$/nspr-config mozilla$/security$/nss$/nss-config
+OUT2BIN=config/nspr-config mozilla/security/nss/nss-config
 
-BUILD_DIR=mozilla$/security$/nss
+BUILD_DIR=mozilla/security/nss
 BUILD_ACTION= $(GNUMAKE) nss_build_all
 #See #i105566# && moz#513024#
 .IF "$(OS)"=="LINUX"
@@ -126,20 +126,20 @@ nss_LIBS=
 nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 
-BUILD_DIR=mozilla$/security$/nss
+BUILD_DIR=mozilla/security/nss
 BUILD_ACTION=NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all
 
 OUT2LIB= \
-    mozilla$/dist$/out$/lib$/libnspr4.a \
-    mozilla$/dist$/out$/lib$/libnss3.a \
-    mozilla$/dist$/out$/lib$/libnssdbm3.a \
-    mozilla$/dist$/out$/lib$/libnssutil3.a \
-    mozilla$/dist$/out$/lib$/libplc4.a \
-    mozilla$/dist$/out$/lib$/libplds4.a \
-    mozilla$/dist$/out$/lib$/libsmime3.a \
-    mozilla$/dist$/out$/lib$/libsoftokn3.a \
-    mozilla$/dist$/out$/lib$/libsqlite3.a \
-    mozilla$/dist$/out$/lib$/libssl3.a
+    mozilla/dist/out/lib/libnspr4.a \
+    mozilla/dist/out/lib/libnss3.a \
+    mozilla/dist/out/lib/libnssdbm3.a \
+    mozilla/dist/out/lib/libnssutil3.a \
+    mozilla/dist/out/lib/libplc4.a \
+    mozilla/dist/out/lib/libplds4.a \
+    mozilla/dist/out/lib/libsmime3.a \
+    mozilla/dist/out/lib/libsoftokn3.a \
+    mozilla/dist/out/lib/libsqlite3.a \
+    mozilla/dist/out/lib/libssl3.a
 
 .ELSE			# "$(COM)"=="GCC"
 MOZ_MSVCVERSION= 9
@@ -155,32 +155,32 @@ OS_TARGET=WIN95
 
 #To build nss one has to call "make nss_build_all" in 
 #mozilla/security/nss
-NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss)
-BUILD_ACTION= PATH="$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \
+NSS_BUILD_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/mozilla/security/nss
+BUILD_ACTION= PATH="$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)" && $(MOZILLABUILD)/msys/bin/bash -i \
     -c "cd $(NSS_BUILD_DIR) && make nss_build_all"
 
 OUT2LIB= \
-     mozilla$/dist$/out$/lib$/nspr4.lib \
-     mozilla$/dist$/out$/lib$/nss3.lib \
-     mozilla$/dist$/out$/lib$/nssdbm3.lib \
-     mozilla$/dist$/out$/lib$/nssutil3.lib \
-     mozilla$/dist$/out$/lib$/plc4.lib \
-     mozilla$/dist$/out$/lib$/plds4.lib \
-     mozilla$/dist$/out$/lib$/smime3.lib \
-     mozilla$/dist$/out$/lib$/softokn3.lib \
-     mozilla$/dist$/out$/lib$/sqlite3.lib \
-     mozilla$/dist$/out$/lib$/ssl3.lib
+     mozilla/dist/out/lib/nspr4.lib \
+     mozilla/dist/out/lib/nss3.lib \
+     mozilla/dist/out/lib/nssdbm3.lib \
+     mozilla/dist/out/lib/nssutil3.lib \
+     mozilla/dist/out/lib/plc4.lib \
+     mozilla/dist/out/lib/plds4.lib \
+     mozilla/dist/out/lib/smime3.lib \
+     mozilla/dist/out/lib/softokn3.lib \
+     mozilla/dist/out/lib/sqlite3.lib \
+     mozilla/dist/out/lib/ssl3.lib
 
 .ENDIF			# "$(COM)"=="GCC"
 
-OUT2BIN=mozilla$/dist$/out$/lib$/*$(DLLPOST) \
-     config$/nspr-config \
-     mozilla$/security$/nss$/nss-config
+OUT2BIN=mozilla/dist/out/lib/*$(DLLPOST) \
+     config/nspr-config \
+     mozilla/security/nss/nss-config
 
 .ENDIF			# "$(GUI)"=="WNT"
 
 
-OUTDIR2INC=mozilla$/dist$/public$/nss mozilla$/dist$/out$/include
+OUTDIR2INC=mozilla/dist/public/nss mozilla/dist/out/include
 
 # --- Targets ------------------------------------------------------