diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-07-27 17:27:13 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-08-12 06:07:31 (GMT) |
| commit | 5d90187908d315081e4de34a56dadd78d2f30767 (patch) | |
| tree | ddbb99faeaaa1d95e8c6f53de38c6e352512cd83 /src/xvidcore.mk | |
| parent | a99ac7693e12b37a0d19db081587b6d923dc0987 (diff) | |
| download | mxe-5d90187908d315081e4de34a56dadd78d2f30767.zip mxe-5d90187908d315081e4de34a56dadd78d2f30767.tar.gz mxe-5d90187908d315081e4de34a56dadd78d2f30767.tar.bz2 | |
xvidcore: _SUBDIR is top-level directory
See https://github.com/mxe/mxe/pull/1454#issuecomment-235508913
Diffstat (limited to 'src/xvidcore.mk')
| -rw-r--r-- | src/xvidcore.mk | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/xvidcore.mk b/src/xvidcore.mk index 3d8a4f2..8779a58 100644 --- a/src/xvidcore.mk +++ b/src/xvidcore.mk @@ -5,7 +5,7 @@ PKG := xvidcore $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.4 $(PKG)_CHECKSUM := 4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f -$(PKG)_SUBDIR := xvidcore/build/generic +$(PKG)_SUBDIR := xvidcore $(PKG)_FILE := xvidcore-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.xvid.org/downloads/$($(PKG)_FILE) $(PKG)_DEPS := gcc pthreads yasm @@ -17,22 +17,27 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) -i 's,yasm_prog="yasm",yasm_prog="$(TARGET)-yasm",' '$(1)/configure.in' - cd '$(1)' && autoreconf -fi - cd '$(1)' && ./configure \ + $(SED) -i 's,yasm_prog="yasm",yasm_prog="$(TARGET)-yasm",' \ + '$(SOURCE_DIR)/build/generic/configure.in' + cd '$(SOURCE_DIR)/build/generic' && autoreconf -fi + cd '$(SOURCE_DIR)/build/generic' && ./configure \ $(MXE_CONFIGURE_OPTS) - $(MAKE) -C '$(1)' -j 1 BUILD_DIR='build' $(if $(BUILD_STATIC),SHARED,STATIC)_LIB= + $(MAKE) -C '$(SOURCE_DIR)/build/generic' -j 1 BUILD_DIR='$(BUILD_DIR)' \ + $(if $(BUILD_STATIC),SHARED,STATIC)_LIB= $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/../../src/xvid.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m644 '$(SOURCE_DIR)/src/xvid.h' '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' '$(PREFIX)/$(TARGET)/bin' - $(INSTALL) -m644 '$(1)/build/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/$(if $(BUILD_STATIC),lib,bin)/' + $(INSTALL) -m644 '$(BUILD_DIR)/xvidcore.$(LIB_SUFFIX)' \ + '$(PREFIX)/$(TARGET)/$(if $(BUILD_STATIC),lib,bin)/' $(if $(BUILD_STATIC), \ ln -sf '$(PREFIX)/$(TARGET)/lib/xvidcore.$(LIB_SUFFIX)' '$(PREFIX)/$(TARGET)/lib/libxvidcore.$(LIB_SUFFIX)', \ - mv '$(1)/build/xvidcore.dll.a' '$(1)/build/libxvidcore.dll.a' && \ - $(INSTALL) -m644 '$(1)/build/libxvidcore.dll.a' '$(PREFIX)/$(TARGET)/lib/') + mv '$(BUILD_DIR)/xvidcore.dll.a' '$(BUILD_DIR)/libxvidcore.dll.a' && \ + $(INSTALL) -m644 '$(BUILD_DIR)/libxvidcore.dll.a' '$(PREFIX)/$(TARGET)/lib/' + ) endef define $(PKG)_BUILD_x86_64-w64-mingw32 - $(SED) -i 's,yasm_prog="yasm",yasm_prog="$(TARGET)-yasm -DNO_PREFIX",' '$(1)/configure.in' + $(SED) -i 's,yasm_prog="yasm",yasm_prog="$(TARGET)-yasm -DNO_PREFIX",' \ + '$(SOURCE_DIR)/build/generic/configure.in' $($(PKG)_BUILD) endef |