# HG changeset patch
# User John Donoghue
# Date 1406820198 14400
# Node ID 972f2d9c76ca4245dc3a4d6cf1855e203610b7b0
# Parent  05e3d28e2e67f30bb6b337dbd55df5281b8dabd0
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874)

* binary-dist-rules.mk: only include windows dist deps of native-*, npp and msys-base if not native mingw build. change copy-windows-dist-files for same.

diff -r 05e3d28e2e67 -r 972f2d9c76ca binary-dist-rules.mk
--- a/binary-dist-rules.mk	Fri Aug 01 09:16:07 2014 -0400
+++ b/binary-dist-rules.mk	Thu Jul 31 11:23:18 2014 -0400
@@ -12,10 +12,15 @@
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   TAR_H_OPTION := -h
   WINDOWS_BINARY_DIST_DEPS := \
-    msys-base \
-    native-binutils \
-    native-gcc \
-    npp
+    msys-base 
+
+  ifeq ($(MXE_NATIVE_BUILD),no)
+    WINDOWS_BINARY_DIST_DEPS += \
+      native-binutils \
+      native-gcc \
+      npp
+  endif
+
 endif
 
 BINARY_DIST_DEPS := \
@@ -48,25 +53,36 @@
 endef
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
-  define copy-windows-dist-files
-    echo "  DLL files..."
-    cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
-    cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
-    cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$(build-gcc_VERSION)/*.dll $(OCTAVE_DIST_DIR)/bin
-    echo "  msys base files..."
-    cd $(TOP_DIR)/msys-base \
-      && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
-    echo "  msys extension files..."
-    cd $(TOP_DIR)/msys-extension \
-      && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
-    echo "  notepad++..."
-    cd $(TOP_DIR) \
-      && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
-    echo "  README.html..."
-    cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
-    echo "  refblas..."
-    cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
-  endef
+  ifeq ($(MXE_NATIVE_BUILD),no)
+    define copy-windows-dist-files
+      echo "  DLL files..."
+      cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
+      cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
+      cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$(build-gcc_VERSION)/*.dll $(OCTAVE_DIST_DIR)/bin
+      echo "  msys base files..."
+      cd $(TOP_DIR)/msys-base \
+        && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
+      echo "  msys extension files..."
+      cd $(TOP_DIR)/msys-extension \
+        && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
+      echo "  notepad++..."
+      cd $(TOP_DIR) \
+          && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
+      echo "  README.html..."
+      cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
+      echo "  refblas..."
+      cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
+    endef
+  else
+    define copy-windows-dist-files
+      echo "  DLL files..."
+      cp /mingw/bin/*.dll $(OCTAVE_DIST_DIR)/bin
+      echo "  README.html..."
+      cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
+      echo "  refblas..."
+      cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
+    endef
+  endif
 endif
 
 define make-dist-files-writable