forked from amazingfate/loongoffice
cca8c8cf79
- from nss_macosx.patch drop nmedit hunk (removed upstream) - adapt include and lib paths to changed tarball directory layout Change-Id: Ia5dcce8dfd9d10e7e4ba689eefa9f39a51596dfe Reviewed-on: https://gerrit.libreoffice.org/6670 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
23 lines
1001 B
Diff
23 lines
1001 B
Diff
--- a/a/nspr/config/rules.mk 2008-12-03 00:24:39.000000000 +0100
|
|
+++ b/b/nspr/config/rules.mk 2009-11-27 13:36:22.662753328 +0100
|
|
@@ -415,7 +415,7 @@
|
|
|
|
ifdef NEED_ABSOLUTE_PATH
|
|
# The quotes allow absolute paths to contain spaces.
|
|
-pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))"
|
|
+pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(shell cygpath -m $(1))),$(1),$(shell cygpath -m $(CURDIR)/$(1))))"
|
|
endif
|
|
|
|
$(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp
|
|
--- a/a/nss/coreconf/rules.mk 2008-12-03 00:24:39.000000000 +0100
|
|
+++ b/b/nss/coreconf/rules.mk 2009-11-27 13:36:22.662753328 +0100
|
|
@@ -411,7 +411,7 @@
|
|
endif
|
|
|
|
# The quotes allow absolute paths to contain spaces.
|
|
-core_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))"
|
|
+core_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(shell cygpath -m $(1))),$(1),$(shell cygpath -m $(PWD)/$(1))))"
|
|
|
|
$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c
|
|
@$(MAKE_OBJDIR)
|