diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:56 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:56 +0100 |
| commit | 761118f831295454a896a6d2921db0d8212fcd5b (patch) | |
| tree | 40872f5c098ce390ef666bf86fcb124af6697989 /sdext/source/presenter | |
| parent | 459cbc6cada544c9e50cf4f86dc821853f26deda (diff) | |
| parent | 39250f089adfce87856a0a7a250511decd7418e2 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
jfreereport/java/flute/makefile.mk
jfreereport/java/libbase/makefile.mk
jfreereport/java/libfonts/makefile.mk
jfreereport/java/libformula/makefile.mk
jfreereport/java/libloader/makefile.mk
jfreereport/java/librepository/makefile.mk
jfreereport/java/libserializer/makefile.mk
jfreereport/java/libxml/makefile.mk
jfreereport/java/sac/makefile.mk
mysqlc/source/mysqlc_connection.cxx
mysqlc/source/mysqlc_connection.hxx
mysqlc/source/mysqlc_databasemetadata.cxx
mysqlc/source/mysqlc_databasemetadata.hxx
mysqlc/source/mysqlc_driver.cxx
mysqlc/source/mysqlc_driver.hxx
mysqlc/source/mysqlc_general.hxx
mysqlc/source/mysqlc_preparedstatement.hxx
mysqlc/source/mysqlc_resultsetmetadata.hxx
mysqlc/source/mysqlc_statement.hxx
sdext/source/minimizer/impoptimizer.cxx
sdext/source/pdfimport/config/description.xml
sdext/source/pdfimport/tree/drawtreevisiting.cxx
sdext/source/presenter/PresenterWindowManager.cxx
swext/prj/build.lst
Diffstat (limited to 'sdext/source/presenter')
| -rw-r--r--[-rwxr-xr-x] | sdext/source/presenter/description.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sdext/source/presenter/makefile.mk | 5 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index 85393f76e9ff..85393f76e9ff 100755..100644 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 6fe1db1886e2..3c93866a731b 100755..100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -108,7 +108,7 @@ SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP=$(SOLARENV)/src/component.map +SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map SHL1RPATH= OXT DEF1NAME= $(SHL1TARGET) @@ -293,8 +293,11 @@ $(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMON @-$(MKDIRHIER) $(@:d) $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@ +.IF "$(ZIP1TARGETN)"!="" $(ZIP1TARGETN) : $(HELPLINKALLTARGETS) +.ENDIF # "$(ZIP1TARGETN)"!="" + $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f) @-$(MKDIRHIER) $(@:d) +$(COPY) $< $@ |