summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-01-21 17:09:35 +0100
committerMathias Bauer <mba@openoffice.org>2011-01-21 17:09:35 +0100
commit1dca011a0b11cb2be69667abdc3eae1531b62476 (patch)
tree5fd1d9ecbf1fcfcdd440f56568ee686a475d5c09 /solenv
parenta3387f416d1d79de93caa26f801ab16d91af41ea (diff)
CWS gnumake3: #i116349#: patch conversion problems fixed - thanks to cl
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/gbuild/platform/windows.mk15
1 files changed, 6 insertions, 9 deletions
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 1c59b3f8cc13..a8372024ad88 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -199,17 +199,14 @@ endif
# Helper class
-
-gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
-gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR))
-gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR))
-gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR))
+gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
+gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
+gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
+gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
define gb_Helper_abbreviate_dirs_native
-R=$(gb_Helper_REPODIR_NATIVE) && \
-$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,S=$(gb_Helper_SRCDIR_NATIVE) && \
-$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,O=$(gb_Helper_OUTDIR_NATIVE)) && \
-$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(OUTDIR)/,$$O/,W=$(gb_Helper_WORKDIR_NATIVE) && $(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(subst $(WORKDIR)/,$$W/,$(1)))))))))
+R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,O=$(gb_Helper_OUTDIR_NATIVE) && W=$(gb_Helper_WORKDIR_NATIVE) && S=$(gb_Helper_SRCDIR_NATIVE))) && \
+$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)))))))))
endef