Index: /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk	(revision 82460)
+++ /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk	(revision 82461)
@@ -245,15 +245,45 @@
 RePackScriptsAdd_INSTTYPE = stage
 RePackScriptsAdd_SOURCES = \
-	../../../Installer/win/Scripts/UnpackBlessedDrivers.cmd \
+	$(RePackScriptsAdd_0_OUTDIR)/UnpackBlessedDrivers.cmd \
 	$(RePackScriptsAdd_0_OUTDIR)/PackDriversForSubmission.cmd \
 	$(RePackScriptsAdd_0_OUTDIR)/Combined-1-Prepare.cmd \
 	$(RePackScriptsAdd_0_OUTDIR)/Combined-3-RepackAdditions.cmd \
-	$(RePackScriptsAdd_0_OUTDIR)/sign-ev.cmd \
-	$(RePackScriptsAdd_0_OUTDIR)/welcome.bmp \
-	$(RePackScriptsAdd_0_OUTDIR)/VirtualBoxGA-vista.ico \
-	$(RePackScriptsAdd_0_OUTDIR)/VirtualBoxGA-nsis.ico \
-	$(RePackScriptsAdd_0_OUTDIR)/License-gpl-2.0.rtf \
-	$(RePackScriptsAdd_0_OUTDIR)/VBoxGuestAdditions.nsi
-
+	$(RePackScriptsAdd_0_OUTDIR)/sign-ev.cmd
+
+INSTALLS += RePackScriptsAddResources
+RePackScriptsAddResources_TEMPLATE = DUMMY
+RePackScriptsAddResources_INST = repack/resources/
+RePackScriptsAddResources_INSTTYPE = stage
+RePackScriptsAddResources_SOURCES = \
+	$(RePackScriptsAddResources_0_OUTDIR)/welcome.bmp \
+	$(RePackScriptsAddResources_0_OUTDIR)/VirtualBoxGA-vista.ico \
+	$(RePackScriptsAddResources_0_OUTDIR)/VirtualBoxGA-nsis.ico \
+	$(RePackScriptsAddResources_0_OUTDIR)/iexplore.ico \
+	$(RePackScriptsAddResources_0_OUTDIR)/License-gpl-2.0.rtf \
+	$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditions.nsi \
+	$(RePackScriptsAddResources_0_OUTDIR)/dumplog.nsh \
+	$(RePackScriptsAddResources_0_OUTDIR)/ReplaceDLL.nsh \
+	$(RePackScriptsAddResources_0_OUTDIR)/servicepack.nsh \
+	$(RePackScriptsAddResources_0_OUTDIR)/strstr.nsh \
+	$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsCommon.nsh \
+	$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsExternal.nsh \
+	$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsLog.nsh\
+	$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsNT4.nsh \
+	$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsUninstall.nsh \
+	$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsUninstallOld.nsh \
+	$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsVista.nsh\
+	$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsW2KXP.nsh\
+	$(RePackScriptsAddResources_0_OUTDIR)/winver.nsh \
+	$(RePackScriptsAddResources_0_OUTDIR)/AUTORUN.INF \
+	$(RePackScriptsAddResources_0_OUTDIR)/NT3xReadme.txt
+
+INSTALLS += RePackScriptsAddResourcesLanguages
+RePackScriptsAddResourcesLanguages_TEMPLATE = DUMMY
+RePackScriptsAddResourcesLanguages_INST = repack/resources/Languages/
+RePackScriptsAddResourcesLanguages_INSTTYPE = stage
+RePackScriptsAddResourcesLanguages_SOURCES = \
+	$(RePackScriptsAddResourcesLanguages_0_OUTDIR)/English.nsh \
+	$(RePackScriptsAddResourcesLanguages_0_OUTDIR)/French.nsh \
+	$(RePackScriptsAddResourcesLanguages_0_OUTDIR)/German.nsh
 
 
@@ -261,4 +291,7 @@
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-1-Prepare.cmd,Combined-1-Prepare.cmd)
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-3-RepackAdditions.cmd,Combined-3-RepackAdditions.cmd)
+
+$$(RePackScriptsAdd_0_OUTDIR)/UnpackBlessedDrivers.cmd: $(PATH_SUB_CURRENT)/../../../Installer/win/Scripts/UnpackBlessedDrivers.cmd | $$(dir $$@)
+	$(CP) -f $< $@
 
 $$(RePackScriptsAdd_0_OUTDIR)/sign-ev.cmd: | $$(dir $$@)
@@ -274,18 +307,77 @@
 		) )
 
-$$(RePackScriptsAdd_0_OUTDIR)/welcome.bmp: $(PATH_SUB_CURRENT)/welcome.bmp
-	$(CP) -f $< $@
-
-$$(RePackScriptsAdd_0_OUTDIR)/VBoxGuestAdditions.nsi: $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi
-	$(CP) -f $< $@
-
-$$(RePackScriptsAdd_0_OUTDIR)/License-gpl-2.0.rtf : doc/License-gpl-2.0.rtf
-	$(CP) -f $< $@
-
-$$(RePackScriptsAdd_0_OUTDIR)/VirtualBoxGA-vista.ico: src/VBox/Artwork/win/NonOSE/VirtualBoxGA-vista.ico
-	$(CP) -f $< $@
-
-$$(RePackScriptsAdd_0_OUTDIR)/VirtualBoxGA-nsis.ico: src/VBox/Artwork/win/NonOSE/VirtualBoxGA-vista.ico
-	$(CP) -f $< $@
+$$(RePackScriptsAddResources_0_OUTDIR)/welcome.bmp: $(PATH_SUB_CURRENT)/welcome.bmp | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/VirtualBoxGA-vista.ico: src/VBox/Artwork/win/NonOSE/VirtualBoxGA-vista.ico | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/VirtualBoxGA-nsis.ico: src/VBox/Artwork/win/NonOSE/VirtualBoxGA-vista.ico | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/iexplore.ico:  $(PATH_SUB_CURRENT)/iexplore.ico | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/License-gpl-2.0.rtf : doc/License-gpl-2.0.rtf | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditions.nsi: $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/dumplog.nsh: $(PATH_SUB_CURRENT)/dumplog.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/ReplaceDLL.nsh: $(PATH_SUB_CURRENT)/ReplaceDLL.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/servicepack.nsh: $(PATH_SUB_CURRENT)/servicepack.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/strstr.nsh: $(PATH_SUB_CURRENT)/strstr.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsCommon.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsCommon.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsExternal.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsExternal.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsLog.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsLog.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsNT4.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsUninstall.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsUninstallOld.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstallOld.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsVista.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsW2KXP.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/winver.nsh: $(PATH_SUB_CURRENT)/winver.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/AUTORUN.INF: $(PATH_SUB_CURRENT)/ISO/AUTORUN.INF | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResources_0_OUTDIR)/NT3xReadme.txt: $(PATH_SUB_CURRENT)/ISO/NT3xReadme.txt | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResourcesLanguages_0_OUTDIR)/English.nsh: $(PATH_SUB_CURRENT)/Languages/English.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResourcesLanguages_0_OUTDIR)/French.nsh: $(PATH_SUB_CURRENT)/Languages/French.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+$$(RePackScriptsAddResourcesLanguages_0_OUTDIR)/German.nsh: $(PATH_SUB_CURRENT)/Languages/German.nsh | $$(dir $$@)
+	$(CP) -f $< $@
+
+
 
 include $(FILE_KBUILD_SUB_FOOTER)