diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:10 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:10 +0200 |
commit | 66c4b436fc35d3259a3a2ab335a93c89e1347696 (patch) | |
tree | 04052fcc1a8484452d6578d21179671b52e98b74 /reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk | |
parent | fa9174ba091bc8138ccf230ed6e2332c7c5ce3a3 (diff) | |
parent | d36b7a5f861f5eac28a854a8e75c8299203859ce (diff) |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
swext/mediawiki/build.xml
Diffstat (limited to 'reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk')
-rw-r--r-- | reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk index 11501b16437e..a2452646f2c7 100644 --- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk @@ -49,21 +49,18 @@ JAVAFILES := AuthorFunction.java \ TitleFunctionDescription.java \ MetaDataFunctionCategory.java -# PROPERTYFILES := $(shell @$(FIND) . -name "*.properties") -PROPERTYFILES:=$(CLASSDIR)$/$(PACKAGE)$/category.properties \ +COPYFILES := $(CLASSDIR)$/$(PACKAGE)$/category.properties \ $(CLASSDIR)$/$(PACKAGE)$/Title-Function.properties\ $(CLASSDIR)$/$(PACKAGE)$/category_en_US.properties \ $(CLASSDIR)$/$(PACKAGE)$/Author-Function.properties \ $(CLASSDIR)$/$(PACKAGE)$/Author-Function_en_US.properties \ $(CLASSDIR)$/$(PACKAGE)$/Title-Function_en_US.properties -L10NPROPERTYFILES = $(PROPERTYFILES) -ALLTAR : $(PROPERTYFILES) +ALLTAR : $(COPYFILES) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -.IF "$(WITH_LANG)"=="" -$(CLASSDIR)/$(PACKAGE)/%.properties : %.properties - @@-$(MKDIRHIER) $(@:d) - $(COMMAND_ECHO)$(COPY) $< $@ -.ENDIF +$(COPYFILES): $$(@:f) + +$(MKDIRHIER) $(CLASSDIR)$/$(PACKAGE) + +$(COPY) $< $@ + |