diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2009-11-16 15:38:48 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2009-11-16 15:38:48 +0100 |
| commit | 57f9b4fffac7a86aec79b8c5eefc4e31d1ffacc2 (patch) | |
| tree | 0246a3e5560aac541ce1be20b6f920b944a82d14 | |
| parent | 306ac896af18d7c70a9d5bcf8a75bcb9c4a730ef (diff) | |
masterfix: #i10000# wrong conflict resolution, here or in the cws ause10*
| -rw-r--r-- | solenv/inc/target.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 4516959e6cbc..eb4b35008e8a 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1393,17 +1393,20 @@ $(UNIXTEXT) : $(UNIXTEXT:f) # dummy target to keep the build happy if not even the .zip exists. localization tools deal with not existing # localize.sdf themself -$(LOCALIZESDF)%: +"$(LOCALIZESDF)%": @echo $(LOCALIZESDF) @@-$(MKDIRHIER) $(@:d) $(TOUCH) $@ +.IF "$(LOCALIZATION_FOUND)"=="" +.IF "$(LOCALSDFFILE)"!="" "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip @@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET) - @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(FI) - @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)/* $(COMMONMISC)/$(PRJNAME) - @@-$(RM) -rf $(COMMONMISC)/$(PRJNAME)_$(TARGET) + @-unzip -o -d $(COMMONMISC)/$(PRJNAME) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(subst,$(COMMONMISC)/$(PRJNAME)/, $@) + @@$(TOUCH) $@ +.ENDIF # "$(LOCALSDFFILE)"!="" +.ENDIF # "$(LOCALIZATION_FOUND)"=="" .ENDIF # "$(LOCALIZESDF)"!="" .ENDIF # "$(WITH_LANG)"!="" |