From 208f8ee15f93c37cbb9ff5b196492f725f56b529 Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 16 Sep 2010 12:33:53 +0200 Subject: masterfix OOO330: #i10000# build problem with cygwin shell (Windows) --- sdext/source/presenter/makefile.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 687ac51..a26cf54 100755 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -302,9 +302,9 @@ $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp +$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp @echo creating $@ - @@-$(MKDIRHIER) $(@:d) + @-$(MKDIRHIER) $(@:d) $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@ $(ZIP1TARGETN) : $(HELPLINKALLTARGETS) @@ -390,7 +390,7 @@ DESCRIPTION_TMP:=$(ZIP1DIR)$/description.xml.tmp PHONYDESC=.PHONY .ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)" $(DESCRIPTION) $(PHONYDESC) : $$(@:f) - @@-$(MKDIRHIER) $(@:d) + @-$(MKDIRHIER) $(@:d) $(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $(DESCRIPTION_TMP) @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk $(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ -- cgit v1.2.3