changeset 3306:2b4e9822f50b

Undo changeset 2ccb71581ee9, 70873001835f, 724c7c2201aa and create BUILD_TOOLS_PREFIX/bin * src/pcre.mk: undo 724c7c2201aa and create BUILD_TOOLS_PREFIX/bin. * src/libgpg-error.mk: Undo 70873001835f and create BUILD_TOOLS_PREFIX/bin. * src/libgcrypt.mk: Undo ccb71581ee9 and create BUILD_TOOLS_PREFIX/bin.
author John Donoghue <john.donoghue@ieee.org>
date Sun, 10 Nov 2013 20:35:33 -0500
parents 79c0dc273dad
children 6388d5d08c7c
files src/libgcrypt.mk src/libgpg_error.mk src/pcre.mk
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/libgcrypt.mk	Sun Nov 10 20:28:11 2013 -0500
+++ b/src/libgcrypt.mk	Sun Nov 10 20:35:33 2013 -0500
@@ -35,6 +35,7 @@
         $(SED) -i -e '/^LTCPPASCOMPILE/ {s/$$(LIBTOOL)/& --tag=CC/;}' '$(1)/mpi/Makefile')
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= DESTDIR='$(3)'
     if [ $(MXE_NATIVE_BUILD) = no ]; then \
-      $(INSTALL) -m755 '$(3)$(HOST_BINDIR)/libgcrypt-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)libgcrypt-config'; \
+      $(INSTALL) -d '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+      $(INSTALL) -m755 '$(3)$(HOST_BINDIR)/libgcrypt-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)libgcrypt-config'; \
     fi
 endef
--- a/src/libgpg_error.mk	Sun Nov 10 20:28:11 2013 -0500
+++ b/src/libgpg_error.mk	Sun Nov 10 20:35:33 2013 -0500
@@ -26,6 +26,7 @@
     $(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= DESTDIR='$(3)'
     if [ $(MXE_NATIVE_BUILD) = no ]; then \
-      $(INSTALL) -m755 '$(3)$(HOST_BINDIR)/gpg-error-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gpg-error-config'; \
+      $(INSTALL) -d '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+      $(INSTALL) -m755 '$(3)$(HOST_BINDIR)/gpg-error-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gpg-error-config'; \
     fi
 endef
--- a/src/pcre.mk	Sun Nov 10 20:28:11 2013 -0500
+++ b/src/pcre.mk	Sun Nov 10 20:35:33 2013 -0500
@@ -34,6 +34,7 @@
     rm -f '$(HOST_PREFIX)'/share/man/man3/pcre16*.3
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= DESTDIR='$(3)'
     if [ $(MXE_NATIVE_BUILD) = no ]; then \
-      $(INSTALL) -m755 '$(3)$(HOST_BINDIR)/pcre-config' '$(BUILD_TOOLS_PREFIX)/bin/pcre-config'; \
+      $(INSTALL) -d '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+      $(INSTALL) -m755 '$(3)$(HOST_BINDIR)/pcre-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/pcre-config'; \
     fi
 endef