INTEGRATION: CWS sdk06 (1.4.2); FILE MERGED

2003/07/03 14:54:21 jsc 1.4.2.1: #110588# insert subst command to correct slashes for Windows < XP

odk/examples/java/Spreadsheet/Makefile

@@ -2,9 +2,9 @@
 #
 #  $RCSfile: Makefile,v $
 #
-#  $Revision: 1.4 $
+#  $Revision: 1.5 $
 #
-#  last change: $Author: hr $ $Date: 2003-06-30 15:58:32 $
+#  last change: $Author: vg $ $Date: 2003-07-09 10:41:44 $
 #
 #  The Contents of this file are made available subject to the terms of
 #  the BSD license.
@@ -121,12 +121,12 @@ $(CLASSFILES) : $(JAVAFILES) $(GENJAVAFILES)
 
 $(OUT_CLASS)/%.jar : $(OUT_COMP_CLASS)/%.Manifest $(CLASSFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	cd $(OUT_COMP_CLASS) && jar cvfm ../$(@F) $(<F) $($(basename $(basename $(@F)))_CLASSFILES)
+	cd $(subst /,$(PS),$(OUT_COMP_CLASS)) && jar cvfm ../$(@F) $(<F) $($(basename $(basename $(@F)))_CLASSFILES)
 
 $(OUT_BIN)/%.zip : $(OUT_COMP_GEN)/%.rdb $(OUT_CLASS)/%.jar
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_CLASS))
-	cd $(OUT_CLASS) && jar cvfM ../bin/$(@F) $(^F)
+	cd $(subst /,$(PS),$(OUT_CLASS)) && jar cvfM ../bin/$(@F) $(^F)
 	$(DEL) $(subst /,$(PS),$(OUT_CLASS)/$(<F))
 
 $(REGISTERFLAG) : $(COMPONENT1_PACKAGE)