INTEGRATION: CWS pppopt03 (1.4.2); FILE MERGED

2007/10/25 09:47:51 sj 1.4.2.6: fixed typo
2007/10/24 17:44:54 sj 1.4.2.5: graphics moved to default_images
2007/10/24 14:10:08 sj 1.4.2.4: graphics moved to default_images
2007/10/16 13:29:54 sj 1.4.2.3: #i82570# taking care of different spelling on solaris/windows
2007/10/16 08:16:31 sj 1.4.2.2: #i82570# fixed strings
2007/10/15 15:44:55 sj 1.4.2.1: #i82570# fixed strings

sdext/source/minimizer/makefile.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: vg $ $Date: 2007-10-17 12:13:59 $
+#   last change: $Author: hr $ $Date: 2007-11-01 14:10:57 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -109,7 +109,7 @@ COMPONENT_BITMAPS= \
 
 COMPONENT_HELP= \
     $(MISC)$/SunPresentationMinimizer$/help$/help_de.odt \
-    $(MISC)$/SunPresentationMinimizer$/help$/help_en-us.odt
+    $(MISC)$/SunPresentationMinimizer$/help$/help_en-US.odt
     
 COMPONENT_MANIFEST= \
     $(MISC)$/SunPresentationMinimizer$/META-INF$/manifest.xml
@@ -132,7 +132,7 @@ $(COMPONENT_MANIFEST) : $$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
 
-$(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
+$(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@