diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-11-09 18:53:42 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-11-09 18:53:42 (GMT) |
| commit | bb6733abb36d0c709d461623bc43cd5ecc075729 (patch) | |
| tree | 73ebca2f89cdb528c1e23ab046e8ac1dcfd1d701 | |
| parent | a0e90379f4c5a8863820117e110b1a32838abc6c (diff) | |
| download | mxe-bb6733abb36d0c709d461623bc43cd5ecc075729.zip mxe-bb6733abb36d0c709d461623bc43cd5ecc075729.tar.gz mxe-bb6733abb36d0c709d461623bc43cd5ecc075729.tar.bz2 | |
wxwidgets: Use $(MXE_DISABLE_CRUFT)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
| -rw-r--r-- | src/wxwidgets.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index 09fc9ee..2884b3d 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -61,10 +61,14 @@ define $(PKG)_BUILD_UNICODE cd '$(1).unicode' && '$(1)/configure' \ $($(PKG)_CONFIGURE_OPTS) \ --enable-unicode - $(MAKE) -C '$(1).unicode' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - -$(MAKE) -C '$(1).unicode/locale' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= allmo - $(MAKE) -C '$(1).unicode' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/wx-config' '$(PREFIX)/bin/$(TARGET)-wx-config' + $(MAKE) -C '$(1).unicode' -j '$(JOBS)' \ + $(MXE_DISABLE_CRUFT) + -$(MAKE) -C '$(1).unicode/locale' -j '$(JOBS)' allmo \ + $(MXE_DISABLE_CRUFT) + $(MAKE) -C '$(1).unicode' -j 1 install \ + $(MXE_DISABLE_CRUFT) __install_wxrc___depname= + $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/wx-config' \ + '$(PREFIX)/bin/$(TARGET)-wx-config' endef # ansi build has been long deprecated @@ -75,13 +79,13 @@ define $(PKG)_BUILD_ANSI cd '$(1).ansi' && '$(1)/configure' \ $($(PKG)_CONFIGURE_OPTS) \ --disable-unicode - $(MAKE) -C '$(1).ansi' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + $(MAKE) -C '$(1).ansi' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) # backup of the unicode wx-config script # such that "make install" won't overwrite it mv '$(PREFIX)/$(TARGET)/bin/wx-config' '$(PREFIX)/$(TARGET)/bin/wx-config-backup' - $(MAKE) -C '$(1).ansi' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= + $(MAKE) -C '$(1).ansi' -j 1 install $(MXE_DISABLE_CRUFT) __install_wxrc___depname= mv '$(PREFIX)/$(TARGET)/bin/wx-config' '$(PREFIX)/$(TARGET)/bin/wx-config-nounicode' $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/wx-config-nounicode' '$(PREFIX)/bin/$(TARGET)-wx-config-nounicode' |