From 467e1ec2c77cd159d88bca86a5a97b932f7a4c65 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Thu, 25 Jan 2007 11:47:16 +0000 Subject: INTEGRATION: CWS ause069 (1.6.70); FILE MERGED 2006/11/28 09:49:51 hjs 1.6.70.1: #i70359# remove forced shell calls --- filter/source/config/tools/merge/makefile.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'filter/source/config/tools/merge') 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)" != "" -- cgit