summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-06-07 18:18:52 +0200
committerMichael Stahl <mstahl@redhat.com>2013-06-07 18:20:09 +0200
commit046cf9a53f46b8bc9d6bcd5f0ea4af6c9a6125a7 (patch)
tree30008f7ca96022d05c22272f9142574e60cd4bdc /solenv
parent3e70e26cbc96667e2968cd325737053bf8bffb78 (diff)
gbuild: fix library paths in gb_Extension__compile_help_onelang
Apparently *COMMAND are evaluated once too much so the $ are lost. Change-Id: Iefc2a945b9ce708bc0f0f5490e1c2f2f7bba1616
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Extension.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 3990e84b6781..5f13af949320 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -430,7 +430,7 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \
$$(call gb_Output_announce,$(1) $(2),$(true),XHC,3)
$$(call gb_Helper_abbreviate_dirs, \
mkdir -p $$(basename $$@) && \
- $(gb_Extension_HELPLINKERCOMMAND) -mod help \
+ $$(gb_Extension_HELPLINKERCOMMAND) -mod help \
-extlangsrc $(call gb_Extension_get_workdir,$(1))/help/$(2) \
-sty $(OUTDIR_FOR_BUILD)/bin/embed.xsl \
-extlangdest $$(basename $$@) \
@@ -438,9 +438,9 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \
-idxcontent $(OUTDIR_FOR_BUILD)/bin/idxcontent.xsl \
$$(HELPFILES) && \
(cd $(call gb_Extension_get_workdir,$(1))/help/$(2) && \
- $(gb_Extension_ZIPCOMMAND) -r $$(basename $$@)/help.jar \
+ $$(gb_Extension_ZIPCOMMAND) -r $$(basename $$@)/help.jar \
$$(HELPFILES)) && \
- $(gb_Extension_HELPINDEXERCOMMAND) -lang $(2) -mod help \
+ $$(gb_Extension_HELPINDEXERCOMMAND) -lang $(2) -mod help \
-dir $$(basename $$@) && \
rm -fr $$(basename $$@)/caption $$(basename $$@)/content && \
touch $$@)