diff options
| -rw-r--r-- | src/autotools.mk | 14 | ||||
| -rw-r--r-- | src/mxe-conf.mk | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/autotools.mk b/src/autotools.mk index 475f912..0b111d1 100644 --- a/src/autotools.mk +++ b/src/autotools.mk @@ -7,3 +7,17 @@ $(PKG)_VERSION := 1 $(PKG)_DEPS := libtool pkgconf $(PKG)_TARGETS := $(BUILD) $(PKG)_TYPE := meta + +define $(PKG)_BUILD_$(BUILD) + # fail early if autotools can't autoreconf + # 1. detect mismatches in installation locations + # 2. ??? + (echo 'AC_INIT([mxe.cc], [1])'; \ + $(foreach PROG, autoconf automake libtool, \ + echo 'AC_PATH_PROG([$(call uc,$(PROG))], [$(PROG)])';) \ + echo 'PKG_PROG_PKG_CONFIG(0.16)'; \ + echo 'AC_OUTPUT') \ + > '$(BUILD_DIR)/configure.ac' + cd '$(BUILD_DIR)' && autoreconf -fiv + cd '$(BUILD_DIR)' && ./configure +endef diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index f6e285d..d461348 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -22,18 +22,6 @@ define $(PKG)_BUILD_$(BUILD) mkdir -p '$(PREFIX)/bin' $(INSTALL) -m755 '$(EXT_DIR)/config.guess' '$(PREFIX)/bin/' - # fail early if autotools can't autoreconf - # 1. detect mismatches in installation locations - # 2. ??? - (echo 'AC_INIT([mxe.cc], [1])'; \ - $(foreach PROG, autoconf automake libtool, \ - echo 'AC_PATH_PROG([$(call uc,$(PROG))], [$(PROG)])';) \ - echo 'PKG_PROG_PKG_CONFIG(0.16)'; \ - echo 'AC_OUTPUT') \ - > '$(1)/configure.ac' - cd '$(1)' && autoreconf -fiv - cd '$(1)' && ./configure - #create script "wine" in a directory which is in PATH mkdir -p '$(PREFIX)/$(BUILD)/bin/' (echo '#!/usr/bin/env bash'; \ |