[Libreoffice-commits] .: Branch 'libreoffice-3-3' - sdext/source

[Fridrich Strba]

 sdext/source/presenter/makefile.mk |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit dffdb2c6d18435360b05a4fbf111fcd86cca4248
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Dec 13 21:19:49 2010 +0100

    Don't bundle MSVC runtime + don't dupplicate licenses

diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index bb8a974..f20fa5b 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -313,7 +313,7 @@ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
 $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
     @-$(MKDIRHIER) $(@:d)
     +$(COPY) $< $@
-.IF "$(OS)$(CPU)"=="WNTI"
+.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
  .IF "$(COM)"=="GCC"
     $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR)
  .ELSE
@@ -353,7 +353,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
         .ENDIF
     .ENDIF         # "$(PACKMS)"!=""
  .ENDIF	#"$(COM)"=="GCC"
-.ENDIF
+.ENDIF #"$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
 
 
 
@@ -365,19 +365,14 @@ $(ZIP1DIR)$/%.xcs : %.xcs
     @@-$(MKDIRHIER) $(@:d)
     $(GNUCOPY) $< $@
 
-# Temporary file that is used to replace some placeholders in description.xml.
-DESCRIPTION_TMP:=$(ZIP1DIR)$/description.xml.tmp
-
 .INCLUDE .IGNORE : $(ZIP1DIR)_lang_track.mk
 .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
 PHONYDESC=.PHONY
 .ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
 $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
     @-$(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)/ > $@
-    @@-$(RM) $(DESCRIPTION_TMP)
+    $(TYPE) description.tmp | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
 
 
 .ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"