diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-09-28 18:00:47 +0200 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-09-28 18:00:47 +0200 |
| commit | 7535d77f6ae33900822e50eb349243008b931aa9 (patch) | |
| tree | 134c9660bf4f4a223bed0fe9e5b7b7fc261cfeb5 /solenv/inc/target.mk | |
| parent | b1f9477fa2f4e9dd764966f595ae7a2c861041ea (diff) | |
fixed broken manual merge
Diffstat (limited to 'solenv/inc/target.mk')
| -rw-r--r-- | solenv/inc/target.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 705368b3b4e3..be919e591bcf 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1396,9 +1396,8 @@ $(UNIXTEXT) : $(UNIXTEXT:f) $(LOCALIZESDF)%: @echo $(LOCALIZESDF) @@-$(MKDIRHIER) $(@:d) + $(TOUCH) $@ -.IF "$(LOCALIZATION_FOUND)"=="" -.IF "$(LOCALIZESDF)"!="" "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip @@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET) |