mk: Base the windows dist target on prepare.mk

diff --git a/Makefile.in b/Makefile.in
index 65c3d6267834d286c011273f4df7f99ae6768269..5e6e8f310c7814e1a5078163d6299a80e5f87802 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -222,6 +222,7 @@ endif
 
 # Copy all the distributables to another directory for binary install
 ifneq ($(strip $(findstring prepare,$(MAKECMDGOALS)) \
+               $(findstring dist,$(MAKECMDGOALS)) \
                $(findstring install,$(MAKECMDGOALS))),)
   CFG_INFO := $(info cfg: including prepare rules)
   include $(CFG_SRC_DIR)mk/prepare.mk

diff --git a/mk/dist.mk b/mk/dist.mk
index 89727cecef9e26d3cc9546d168fc273c59b93ce4..1a4d7a278437fb6d8791682d8866820c200b855e 100644 (file)
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -52,12 +52,24 @@ LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT
        cp $< $@
 
 $(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \
-            $(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD))
-       $(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py i686-pc-mingw32/stage3/bin
+            $(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
+            dist-prepare-win
+       $(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py tmp/dist/win/bin
        @$(call E, ISCC: $@)
        $(Q)"$(CFG_ISCC)" $<
-endif
 
+dist-prepare-win: PREPARE_HOST=$(CFG_BUILD)
+dist-prepare-win: PREPARE_TARGETS=$(CFG_BUILD)
+dist-prepare-win: PREPARE_DEST_DIR=tmp/dist/win
+# On windows we're using stage3, unlike Unix...
+dist-prepare-win: PREPARE_STAGE=3
+dist-prepare-win: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
+dist-prepare-win: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
+dist-prepare-win: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
+dist-prepare-win: PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
+dist-prepare-win: prepare-base
+
+endif
 
 $(PKG_TAR): $(PKG_FILES)
        @$(call E, making dist dir)

diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss
index 635d385d7c410d1f32f710523e943391ba24546c..559ed0e860f42985eaed0487a2f0254552dcd5b4 100644 (file)
--- a/src/etc/pkg/rust.iss
+++ b/src/etc/pkg/rust.iss
@@ -36,7 +36,7 @@ Uninstallable=yes
 Name: modifypath; Description: &Add {app}\bin to your PATH (recommended)
 
 [Files]
-Source: "i686-pc-mingw32/stage3/*.*" ; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
+Source: "tmp/dist/win/*.*" ; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
 
 [Code]
 const