# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1375850510 14400
# Node ID 11f8ec654cd4be2b6ce65e2a4af156f8cb0cb8e5
# Parent  03873a95c76a30abae88d361d0be4663c0a339ad
Avoid copying or linking files that are the same when doing native build

Prefer $(INSTALL) over $(LN_SF).

diff -r 03873a95c76a -r 11f8ec654cd4 src/apr-util.mk
--- a/src/apr-util.mk	Tue Aug 06 21:46:56 2013 -0400
+++ b/src/apr-util.mk	Wed Aug 07 00:41:50 2013 -0400
@@ -27,5 +27,7 @@
         --with-apr='$(HOST_PREFIX)' \
         CFLAGS=-D_WIN32_WINNT=0x0500
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
-    $(LN_SF) '$(HOST_BINDIR)/apu-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)apu-1-config'
+    if [ $(MXE_NATIVE_BUILD) = no ]; then \
+      $(INSTALL) -m755 '$(HOST_BINDIR)/apu-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)apu-1-config'; \
+    fi
 endef
diff -r 03873a95c76a -r 11f8ec654cd4 src/fltk.mk
--- a/src/fltk.mk	Tue Aug 06 21:46:56 2013 -0400
+++ b/src/fltk.mk	Wed Aug 07 00:41:50 2013 -0400
@@ -46,5 +46,7 @@
     $(MAKE) -C '$(1)' -j '$(JOBS)' install \
         DIRS=src \
         LIBCOMMAND='$(MXE_AR) cr'
-    $(LN_SF) '$(HOST_BINDIR)/fltk-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config'
+    if [ $(MXE_NATIVE_BUILD) = no ]; then \
+      $(INSTALL) -m755 '$(HOST_BINDIR)/fltk-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config'; \
+    fi
 endef
diff -r 03873a95c76a -r 11f8ec654cd4 src/gdal.mk
--- a/src/gdal.mk	Tue Aug 06 21:46:56 2013 -0400
+++ b/src/gdal.mk	Wed Aug 07 00:41:50 2013 -0400
@@ -81,5 +81,7 @@
     $(MAKE) -C '$(1)/alg'   -j 1 install
     $(MAKE) -C '$(1)/ogr'   -j 1 install OGR_ENABLED=
     $(MAKE) -C '$(1)/apps'  -j 1 install BIN_LIST=
-    $(LN_SF) '$(HOST_BINDIR)/gdal-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gdal-config'
+    if [ $(MXE_NATIVE_BUILD) = no ]; then \
+      $(INSTALL) -m755 '$(HOST_BINDIR)/gdal-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gdal-config'; \
+    fi
 endef
diff -r 03873a95c76a -r 11f8ec654cd4 src/libgcrypt.mk
--- a/src/libgcrypt.mk	Tue Aug 06 21:46:56 2013 -0400
+++ b/src/libgcrypt.mk	Wed Aug 07 00:41:50 2013 -0400
@@ -25,5 +25,7 @@
     $(if $(filter msvc,$(MXE_SYSTEM)), \
         $(SED) -i -e '/^LTCPPASCOMPILE/ {s/$$(LIBTOOL)/& --tag=CC/;}' '$(1)/mpi/Makefile')
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    $(LN_SF) '$(HOST_BINDIR)/libgcrypt-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)libgcrypt-config'
+    if [ $(MXE_NATIVE_BUILD) = no ]; then \
+      $(INSTALL) -m755 '$(HOST_BINDIR)/libgcrypt-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)libgcrypt-config'; \
+    fi
 endef
diff -r 03873a95c76a -r 11f8ec654cd4 src/libgpg_error.mk
--- a/src/libgpg_error.mk	Tue Aug 06 21:46:56 2013 -0400
+++ b/src/libgpg_error.mk	Wed Aug 07 00:41:50 2013 -0400
@@ -25,5 +25,7 @@
         --disable-languages && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    $(LN_SF) '$(HOST_BINDIR)/gpg-error-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gpg-error-config'
+    if [ $(MXE_NATIVE_BUILD) = no ]; then \
+      $(INSTALL) -m755 '$(HOST_BINDIR)/gpg-error-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gpg-error-config'; \
+    fi
 endef
diff -r 03873a95c76a -r 11f8ec654cd4 src/llvm.mk
--- a/src/llvm.mk	Tue Aug 06 21:46:56 2013 -0400
+++ b/src/llvm.mk	Wed Aug 07 00:41:50 2013 -0400
@@ -53,7 +53,7 @@
       --prefix='$(HOST_PREFIX)'
 
     PATH='$(HOST_BINDIR):$(PATH)' $(MAKE) -C '$(1)/build' -j $(JOBS) install
-    $(LN_SF) '$(HOST_BINDIR)/llvm-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)llvm-config'
+    $(INSTALL) -m755 '$(HOST_BINDIR)/llvm-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)llvm-config'
 endef
 endif
 else
@@ -67,6 +67,8 @@
     $(MAKE) -C '$(1)/build' -j $(JOBS) llvm-tblgen
     $(MAKE) -C '$(1)/build' -j $(JOBS) intrinsics_gen
     $(MAKE) -C '$(1)/build' -j $(JOBS) install
-    $(LN_SF) '$(HOST_BINDIR)/llvm-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)llvm-config'
+    if [ $(MXE_NATIVE_BUILD) = no ]; then \
+      $(INSTALL) -m755 '$(HOST_BINDIR)/llvm-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)llvm-config'; \
+    fi
 endef
 endif
diff -r 03873a95c76a -r 11f8ec654cd4 src/pcre.mk
--- a/src/pcre.mk	Tue Aug 06 21:46:56 2013 -0400
+++ b/src/pcre.mk	Wed Aug 07 00:41:50 2013 -0400
@@ -33,5 +33,7 @@
         --disable-pcretest-libreadline && $(CONFIGURE_POST_HOOK)
     rm -f '$(HOST_PREFIX)'/share/man/man3/pcre16*.3
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    $(INSTALL) -m755 $(HOST_BINDIR)/pcre-config $(BUILD_TOOLS_PREFIX)/bin/pcre-config
+    if [ $(MXE_NATIVE_BUILD) = no ]; then \
+      $(INSTALL) -m755 $(HOST_BINDIR)/pcre-config $(BUILD_TOOLS_PREFIX)/bin/pcre-config; \
+    fi
 endef
diff -r 03873a95c76a -r 11f8ec654cd4 src/postgresql.mk
--- a/src/postgresql.mk	Tue Aug 06 21:46:56 2013 -0400
+++ b/src/postgresql.mk	Wed Aug 07 00:41:50 2013 -0400
@@ -80,5 +80,7 @@
         --with-system-tzdata=/dev/null
     $(MAKE) -C '$(1).native'/src/port          -j '$(JOBS)'
     $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install
-    $(LN_SF) '$(HOST_BINDIR)/pg_config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config'
+    if [ $(MXE_NATIVE_BUILD) = no ]; then \
+      $(INSTALL) -m755 '$(HOST_BINDIR)/pg_config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config'; \
+    fi
 endef
diff -r 03873a95c76a -r 11f8ec654cd4 src/qt.mk
--- a/src/qt.mk	Tue Aug 06 21:46:56 2013 -0400
+++ b/src/qt.mk	Wed Aug 07 00:41:50 2013 -0400
@@ -171,30 +171,18 @@
        cp -f '$(1)/lib/pkgconfig/'*.pc '$(HOST_LIBDIR)/pkgconfig/';  \
     fi
 
-    # using if-function, this allows to keep the code structure untouched,
-    # including the comments, however one must make sure there is no comma
-    $(if $(filter-out msvc,$(MXE_SYSTEM)),
-        $(LN_SF) '$($(PKG)_PREFIX)/bin/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'
-        $(LN_SF) '$($(PKG)_PREFIX)/bin/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc'
-        $(LN_SF) '$($(PKG)_PREFIX)/bin/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'
-        $(LN_SF) '$($(PKG)_PREFIX)/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'
-
-        # cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro
-        # $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install
-
-        # cd '$(1)/tools/designer' && '$(1)/bin/qmake' designer.pro
-        # $(MAKE) -C '$(1)/tools/designer' -j '$(JOBS)' install
+    if [ $(MXE_SYSTEM) != msvc ]; then \
+      if [ $(MXE_NATIVE_BUILD) = no ]; then \
+        $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'; \
+        $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc'; \
+        $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'; \
+        $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'; \
+      fi
 
-        # # at least some of the qdbus tools are useful on target
-        # cd '$(1)/tools/qdbus' && '$(1)/bin/qmake' qdbus.pro
-        # $(MAKE) -C '$(1)/tools/qdbus' -j '$(JOBS)' install
-
-        # lrelease (from linguist) needed by octave for GUI build
-        $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install
-        $(LN_SF) '$($(PKG)_PREFIX)/bin/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'
-
-        # mkdir            '$(1)/test-qt'
-        # cd               '$(1)/test-qt' && '$(MXE_QMAKE)' '$(PWD)/$(2).pro'
-        # $(MAKE)       -C '$(1)/test-qt' -j '$(JOBS)'
-        # $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(HOST_BINDIR)')
+      # lrelease (from linguist) needed by octave for GUI build
+      $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install
+      if [ $(MXE_NATIVE_BUILD) = no ]; then \
+        $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'); \
+      fi
+    fi
 endef
diff -r 03873a95c76a -r 11f8ec654cd4 src/xvidcore.mk
--- a/src/xvidcore.mk	Tue Aug 06 21:46:56 2013 -0400
+++ b/src/xvidcore.mk	Wed Aug 07 00:41:50 2013 -0400
@@ -25,5 +25,5 @@
     $(INSTALL) -m644 '$(1)/../../src/xvid.h' '$(HOST_INCDIR)'
     $(INSTALL) -d '$(HOST_LIBDIR)'
     $(INSTALL) -m644 '$(1)/build/xvidcore.a' '$(HOST_LIBDIR)'
-    $(LN_SF) '$(HOST_LIBDIR)/xvidcore.a' '$(HOST_LIBDIR)/libxvidcore.a'
+    $(INSTALL) -m644 '$(HOST_LIBDIR)/xvidcore.a' '$(HOST_LIBDIR)/libxvidcore.a'
 endef