Index: makefile.mk
===================================================================
RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
retrieving revision 1.10
diff -u -r1.10 makefile.mk
--- makefile.mk	18 Oct 2004 14:06:42 -0000	1.10
+++ makefile.mk	29 Nov 2004 12:15:43 -0000
@@ -72,7 +72,9 @@
 INSTALLDIR=$(OUT)
 
 .INCLUDE: target.mk
-
+.IF "$(CWS_WORK_STAMP)"==""
+.INCLUDE .IGNORE: cwsname.mk
+.ENDIF          # "$(CWS_WORK_STAMP)"==""
 
 .IF "$(UPDATER)"!=""
 ALLTAR : updatepack
@@ -98,10 +100,10 @@
 ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
 
 openoffice_%:
-	+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f openoffice.lst -l $(@:s/openoffice_//) -p OpenOffice -packagelist ..$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate ..$/inc_openoffice$/windows$/msi_templates -msilanguage $(COMMONMISC)$/win_ulffiles -rpm
+	+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -m $(LAST_MINOR) -f openoffice.lst -l $(@:s/openoffice_//) -p OpenOffice -packagelist ..$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate ..$/inc_openoffice$/windows$/msi_templates -msilanguage $(COMMONMISC)$/win_ulffiles -rpm
 
 ooolanguagepack_%:
-	+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f openoffice.lst -l $(@:s/ooolanguagepack_//) -p OpenOffice -packagelist ..$/inc_openoffice$/unix$/packagelist_language.txt -u $(OUT) -buildid $(BUILD) -msitemplate ..$/inc_ooolangpack$/windows$/msi_templates -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -rpm
+	+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -m $(LAST_MINOR) -f openoffice.lst -l $(@:s/ooolanguagepack_//) -p OpenOffice -packagelist ..$/inc_openoffice$/unix$/packagelist_language.txt -u $(OUT) -buildid $(BUILD) -msitemplate ..$/inc_ooolangpack$/windows$/msi_templates -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -rpm
 
 .ELSE			# "$(alllangiso)"!=""
 openoffice: