Mercurial > mxe-octave

changeset 4769:46bf69e11b71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/units.mk: when cross compile for mingw, dont use configure detected units and local file locations
author John Donoghue
date Wed, 11 Jul 2018 13:35:02 -0400
parents 0bee767e21ed
children 6cfa1fbe8d2f
files src/units.mk
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/units.mk	Tue Jul 10 13:35:03 2018 -0400
+++ b/src/units.mk	Wed Jul 11 13:35:02 2018 -0400
@@ -21,6 +21,13 @@
         --prefix='$(HOST_PREFIX)' \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) 
 
+    # override units and localalemap from what configure detected for cross mingw
+    if [ "$(MXE_SYSTEM)$(MXE_NATIVE_BUILD)" == "mingwno" ]; then \
+        $(SED) -i -e 's,UNITSFILE=\\\".*definitions.units\\\",UNITSFILE=\\\"definitions.units\\\",g' \
+	    -e 's,LOCALEMAP=\\\".*locale_map.txt\\\",LOCALEMAP=\\\"locale_map.txt\\\",g' \
+	    '$(1)/Makefile'; \
+    fi
+
     $(MAKE) -C '$(1)' -j '$(JOBS)' 
     $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)'
 endef