diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:47:16 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 11:47:16 +0000 |
| commit | 467e1ec2c77cd159d88bca86a5a97b932f7a4c65 (patch) | |
| tree | 0d980b35e44186eaef179b5e305899c666b1b7bc /filter/source/config/tools/merge | |
| parent | 4c5f86829d395ece457d2a3b7e858006ea4cbc07 (diff) | |
INTEGRATION: CWS ause069 (1.6.70); FILE MERGED
2006/11/28 09:49:51 hjs 1.6.70.1: #i70359# remove forced shell calls
Diffstat (limited to 'filter/source/config/tools/merge')
| -rw-r--r-- | filter/source/config/tools/merge/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/config/tools/merge/makefile.mk b/filter/source/config/tools/merge/makefile.mk index 2c54ca92ca3e..f92ca3d49e15 100644 --- a/filter/source/config/tools/merge/makefile.mk +++ b/filter/source/config/tools/merge/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: hr $ $Date: 2006-06-19 17:10:16 $ +# last change: $Author: obo $ $Date: 2007-01-25 12:47:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -89,7 +89,7 @@ $(JARTARGETN) : $(OWNCOPY) .ENDIF $(OWNCOPY) : $(CFGFILES) - +-$(MKDIR) $(CLASSDIR)$/$(PACKAGE) - +$(COPY) $? $(CLASSDIR)$/$(PACKAGE) && $(TOUCH) $@ + -$(MKDIR) $(CLASSDIR)$/$(PACKAGE) + $(COPY) $? $(CLASSDIR)$/$(PACKAGE) && $(TOUCH) $@ .ENDIF # "$(SOLAR_JAVA)" != "" |