sc: filter: html: fix missing color scale conditional format
[LibreOffice.git] / external / nss / nss-win32-make.patch.1
blob6a3201a082a19f5b1374ec7cdc78c20b47ea6b25
1 --- nss/nss/coreconf/rules.mk.orig2     2014-06-03 15:30:01.667200000 +0200
2 +++ nss/nss/coreconf/rules.mk   2014-06-03 15:30:14.537200000 +0200
3 @@ -174,7 +174,7 @@
4  $(LIBRARY): $(OBJS) | $$(@D)/d
5         rm -f $@
6  ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
7 -       $(AR) $(subst /,\\,$(OBJS))
8 +       $(AR) $(OBJS)
9  else
10         $(AR) cr $@ $(OBJS)
11  endif
12 @@ -214,7 +214,7 @@
13  ifdef NS_USE_GCC
14         $(LINK_DLL) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES)
15  else
16 -       $(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES))
17 +       $(LINK_DLL) -MAP $(DLLBASE) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES)
18  ifdef MT
19         if test -f $@.manifest; then \
20                 $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \