Mercurial > mxe-octave

comparison src/units.mk @ 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 b92fc8cfb49a
children a38076a1fcb2
comparison
equal deleted inserted replaced
4768:0bee767e21ed 4769:46bf69e11b71
19 define $(PKG)_BUILD 19 define $(PKG)_BUILD
20 cd '$(1)' && ./configure \ 20 cd '$(1)' && ./configure \
21 --prefix='$(HOST_PREFIX)' \ 21 --prefix='$(HOST_PREFIX)' \
22 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) 22 $(HOST_AND_BUILD_CONFIGURE_OPTIONS)
23 23
24 # override units and localalemap from what configure detected for cross mingw
25 if [ "$(MXE_SYSTEM)$(MXE_NATIVE_BUILD)" == "mingwno" ]; then \
26 $(SED) -i -e 's,UNITSFILE=\\\".*definitions.units\\\",UNITSFILE=\\\"definitions.units\\\",g' \
27 -e 's,LOCALEMAP=\\\".*locale_map.txt\\\",LOCALEMAP=\\\"locale_map.txt\\\",g' \
28 '$(1)/Makefile'; \
29 fi
30
24 $(MAKE) -C '$(1)' -j '$(JOBS)' 31 $(MAKE) -C '$(1)' -j '$(JOBS)'
25 $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)' 32 $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)'
26 endef 33 endef