diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-09-10 17:05:00 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-09-10 17:05:00 +0200 |
| commit | 9ec25654f39e2b3a3b90b811fde6949fe379ffcd (patch) | |
| tree | 0c0691d9a13da49506776893653a12d12b432515 | |
| parent | 3c224c60cc23cbd5d9c54f254f0ed5f20f995c7f (diff) | |
jl158 #i114008# sed problem on solaris fixed
| -rwxr-xr-x | sdext/source/presenter/makefile.mk | 2 | ||||
| -rw-r--r-- | swext/mediawiki/help/makefile.mk | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index eacc4c726725..687ac514ca57 100755 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -305,7 +305,7 @@ $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f) $(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp @echo creating $@ @@-$(MKDIRHIER) $(@:d) - $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/ ; s/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g " > $@ + $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@ $(ZIP1TARGETN) : $(HELPLINKALLTARGETS) diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk index 72608a80de0b..86773dcb7f3f 100644 --- a/swext/mediawiki/help/makefile.mk +++ b/swext/mediawiki/help/makefile.mk @@ -79,7 +79,9 @@ $(OUT_MEDIAWIKI)/help/component.txt : component.txt $(OUT_MEDIAWIKI)/help/%.xhp : $(OUT_MEDIAWIKI)_merge/help/%.xhp @@-$(MKDIRHIER) $(@:d) - $(COMMAND_ECHO)cat $< | sed -e 's/@WIKIEXTENSIONPRODUCTNAME@/Wiki Publisher/g ; s/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g ; s/@WIKIEXTENSIONFILENAME@/wiki-publisher/g' > $@ + $(COMMAND_ECHO)cat $< | sed -e 's/@WIKIEXTENSIONPRODUCTNAME@/Wiki Publisher/g' | \ + sed 's/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g' | \ + sed 's/@WIKIEXTENSIONFILENAME@/wiki-publisher/g' > $@ .ENDIF # "$(ENABLE_MEDIAWIKI)" != "YES" |