Mercurial > mxe-octave
changeset 3012:100e618349f7
Improve handling of prefix directories by defining HOST_PREFIX and
BUILD_TOOLS_PREFIX variables in top-level Makefile.
line wrap: on
line diff
--- a/Makefile Sat Jun 01 20:52:09 2013 -0400 +++ b/Makefile Sun Jun 02 10:31:04 2013 -0400 @@ -1,6 +1,10 @@ # This file is part of MXE. # See index.html for further information. +PWD := $(shell pwd) + +## Configuration variables. + # Set the following configuration variables with a configure script? # Current valid values are mingw (cross) and gnu-linux (native). @@ -11,8 +15,10 @@ MXE_NATIVE_BUILD := no #MXE_NATIVE_BUILD := yes -# Set to "yes" to use the verions of GCC and binutils already -# installed on your system. +# Set to "yes" to use the versions of GCC and binutils already +# installed on your system. NOTE: building a copy of GCC for a +# native build does not appear to work correctly yet, so for now you +# must set USE_SYSTEM_GCC to yes if MXE_NATIVE_BUILD is set to yes. USE_SYSTEM_GCC := no #USE_SYSTEM_GCC := yes @@ -35,6 +41,12 @@ ## end of configuration variables. +# These can't be chosen arbitrarily. The way things are configured now, +# GCC expects to find cross-compiler include files in $(PREFIX)/$(TARGET). +# and it's not clear to me how to change that. +BUILD_TOOLS_PREFIX := $(PWD)/usr +HOST_PREFIX := $(PWD)/usr/$(TARGET) + ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_STATIC),yes) ENABLE_SHARED_OR_STATIC := --enable-shared --enable-static @@ -59,7 +71,6 @@ PKG_MIRROR := s3.amazonaws.com/mxe-pkg PKG_CDN := d1yihgixbnrglp.cloudfront.net -PWD := $(shell pwd) SHELL := bash INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install @@ -76,21 +87,19 @@ LIBTOOLIZE := libtoolize BUILD_TOOLS := $(patsubst src/%.mk, %, $(wildcard src/build-*.mk)) -PREFIX := $(PWD)/usr +STAMP_DIR := $(PWD)/installed-packages +MSYS_INFO_DIR := $(PWD)/msys-info LOG_DIR := $(PWD)/log TIMESTAMP := $(shell date +%Y%m%d_%H%M%S) PKG_DIR := $(PWD)/pkg TMP_DIR = $(PWD)/tmp-$(1) -MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) -TOP_DIR := $(patsubst %/,%,$(dir $(MAKEFILE))) +TOP_DIR := $(PWD) +MAKEFILE := $(TOP_DIR)/Makefile PKGS := $(filter-out $(BUILD_TOOLS), $(shell $(SED) -n 's/^.* id="\([^"]*\)-package">.*$$/\1/p' '$(TOP_DIR)/index.html')) -PATH := $(PREFIX)/bin:$(PATH) -ifeq ($(MXE_NATIVE_BUILD),yes) - PATH := $(PREFIX)/$(TARGET)/bin:$(PATH) -endif +PATH := $(BUILD_TOOLS_PREFIX)/bin:$(PATH) -CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(PREFIX)/$(TARGET)/include' -CONFIGURE_LDFLAGS := LDFLAGS='-L$(PREFIX)/$(TARGET)/lib' +CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include' +CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib' ifeq ($(MXE_NATIVE_BUILD),yes) MXE_AR := ar @@ -106,36 +115,36 @@ MXE_PKG_CONFIG := pkg-config MXE_QMAKE := qmake else - MXE_AR := '$(PREFIX)/bin/$(TARGET)-ar' - MXE_RANLIB := '$(PREFIX)/bin/$(TARGET)-ranlib' - MXE_CC := '$(PREFIX)/bin/$(TARGET)-gcc' - MXE_CXX := '$(PREFIX)/bin/$(TARGET)-g++' - MXE_F77 := '$(PREFIX)/bin/$(TARGET)-gfortran' + MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ar' + MXE_RANLIB := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ranlib' + MXE_CC := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gcc' + MXE_CXX := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-g++' + MXE_F77 := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gfortran' ifeq ($(MXE_SYSTEM),mingw) - MXE_WINDRES := '$(PREFIX)/bin/$(TARGET)-windres' + MXE_WINDRES := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-windres' else MXE_WINDRES := true endif - MXE_PKG_CONFIG := '$(PREFIX)/bin/$(TARGET)-pkg-config' - MXE_QMAKE := '$(PREFIX)/bin/$(TARGET)-qmake' + MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' + MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' endif ifeq ($(MXE_SYSTEM),mingw) MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll endif -MXE_BINDIR := '$(PREFIX)/$(TARGET)/bin' -MXE_LIBDIR := '$(PREFIX)/$(TARGET)/lib' -MXE_INCDIR := '$(PREFIX)/$(TARGET)/include' +MXE_BINDIR := '$(HOST_PREFIX)/bin' +MXE_LIBDIR := '$(HOST_PREFIX)/lib' +MXE_INCDIR := '$(HOST_PREFIX)/include' ifeq ($(MXE_SYSTEM),mingw) ifneq ($(MXE_NATIVE_BUILD),yes) MSYS_BASE_URL := http://sourceforge.net/projects/mingw/files/MSYS/Base MSYS_BASE_VER := 1.0.13 - MSYS_BASE_DIR := $(PREFIX)/../msys-base + MSYS_BASE_DIR := $(TOP_DIR)/msys-base MSYS_BASE_PACKAGES := $(addprefix msys-,bash coreutils diffutils file findutils gawk grep gzip less libiconv libintl libmagic make msys-core regex sed tar termcap) - NOTEPAD_BASE_DIR := $(PREFIX)/../notepad++ + NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++ endif else LD_LIBRARY_PATH := '$(MXE_LIBDIR)' @@ -161,7 +170,7 @@ MAKE_SHARED_FROM_STATIC := \ $(TOP_DIR)/tools/make-shared-from-static $(MAKE_SHARED_FROM_STATIC_OPTIONS) -CMAKE_TOOLCHAIN_FILE := $(PREFIX)/$(TARGET)/share/cmake/mxe-conf.cmake +CMAKE_TOOLCHAIN_FILE := $(HOST_PREFIX)/share/cmake/mxe-conf.cmake # unexport any environment variables that might cause trouble unexport AR CC CFLAGS C_INCLUDE_PATH CPATH CPLUS_INCLUDE_PATH CPP @@ -253,15 +262,15 @@ fi endef -check-requirements: $(PREFIX)/installed/check-requirements -$(PREFIX)/installed/check-requirements: $(MAKEFILE) +check-requirements: $(STAMP_DIR)/check-requirements +$(STAMP_DIR)/check-requirements: $(MAKEFILE) @echo '[check requirements]' $(foreach REQUIREMENT,$(REQUIREMENTS),$(call CHECK_REQUIREMENT,$(REQUIREMENT))) - @[ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed' + @[ -d '$(STAMP_DIR)' ] || mkdir -p '$(STAMP_DIR)' @if test "$(USE_SYSTEM_GCC)" = yes; then \ - $(INSTALL) -d '$(PREFIX)/bin' ; \ - $(INSTALL) -m 755 tools/config.guess '$(PREFIX)/bin/config.guess' ; \ - $(INSTALL) -m 755 tools/config.sub '$(PREFIX)/bin/config.sub' ; \ + $(INSTALL) -d '$(BUILD_TOOLS_PREFIX)/bin' ; \ + $(INSTALL) -m 755 tools/config.guess '$(BUILD_TOOLS_PREFIX)/bin/config.guess' ; \ + $(INSTALL) -m 755 tools/config.sub '$(BUILD_TOOLS_PREFIX)/bin/config.sub' ; \ fi @touch '$@' @@ -290,11 +299,11 @@ fi .PHONY: $(1) -$(1): $(PREFIX)/installed/$(1) -$(PREFIX)/installed/$(1): $(TOP_DIR)/src/$(1).mk \ +$(1): $(STAMP_DIR)/$(1) +$(STAMP_DIR)/$(1): $(TOP_DIR)/src/$(1).mk \ $(wildcard $(TOP_DIR)/src/$(1)-*.patch) \ $(wildcard $(TOP_DIR)/src/$(1)-test*) \ - $(addprefix $(PREFIX)/installed/,$($(1)_DEPS)) \ + $(addprefix $(STAMP_DIR)/,$($(1)_DEPS)) \ | check-requirements @[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)' @if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \ @@ -344,15 +353,18 @@ (du -k -d 0 '$(2)' 2>/dev/null || du -k --max-depth 0 '$(2)') | $(SED) -n 's/^\(\S*\).*/du: \1 KiB/p' rm -rfv '$(2)' ,) - [ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed' - touch '$(PREFIX)/installed/$(1)' + [ -d '$(STAMP_DIR)' ] || mkdir -p '$(STAMP_DIR)' + touch '$(STAMP_DIR)/$(1)' endef $(foreach PKG,$(PKGS),$(eval $(call PKG_RULE,$(PKG),$(call TMP_DIR,$(PKG))))) $(foreach TOOL,$(BUILD_TOOLS),$(eval $(call PKG_RULE,$(TOOL),$(call TMP_DIR,$(TOOL))))) .PHONY: clean clean: - rm -rf $(call TMP_DIR,*) $(PREFIX)/* + rm -rf $(call TMP_DIR,*) $(BUILD_TOOLS_PREFIX) + rm -rf $(STAMP_DIR) $(MSYS_INFO_DIR) $(LOG_DIR) + rm -rf $(MSYS_BASE_DIR) $(NOTEPAD_BASE_DIR) + rm -rf native-tools cross-tools octave gnuplot .PHONY: clean-pkg clean-pkg:
--- a/mk-dist Sat Jun 01 20:52:09 2013 -0400 +++ b/mk-dist Sun Jun 02 10:31:04 2013 -0400 @@ -42,9 +42,8 @@ TOPDIR=$(pwd) PATH=$TOPDIR/usr/bin:$PATH -PREFIX=/usr TARGET=i686-pc-mingw32 -BUILD=x86_64-unwknown-linux-gnu +PREFIX=/usr/$TARGET STRIP=$TARGET-strip DATE=$(date +%Y-%m-%d-%H-%M) OCTAVE_DIST_DIR=$TOPDIR/dist/$OCTAVE_TARGET-$DATE @@ -71,13 +70,13 @@ EOF echo " gcc cross compiler files..." -cd $TOPDIR/cross-tools/$TOPDIR/$PREFIX/$TARGET +cd $TOPDIR/cross-tools/$TOPDIR/$PREFIX find . -type f -o -type l | sed "s,./,," > $TOPDIR/excluded-gcc-files echo "copying files..." echo " octave and dependencies..." -cd $TOPDIR/usr/$TARGET +cd $TOPDIR/$PREFIX tar -c -h -X $TOPDIR/excluded-gcc-files -f - . | ( cd $OCTAVE_DIST_DIR ; tar xpf - ) cp $TOPDIR/build_packages.m $OCTAVE_DIST_DIR/src
--- a/src/agg.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/agg.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,13 +16,13 @@ endef define $(PKG)_BUILD - $(SED) -i 's,aclocal,aclocal -I $(PREFIX)/$(TARGET)/share/aclocal,' '$(1)/autogen.sh' + $(SED) -i 's,aclocal,aclocal -I $(HOST_PREFIX)/share/aclocal,' '$(1)/autogen.sh' $(SED) -i 's,libtoolize,$(LIBTOOLIZE),' '$(1)/autogen.sh' cd '$(1)' && $(SHELL) ./autogen.sh \ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/apr-util.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/apr-util.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,15 +18,15 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ --without-pgsql \ --without-sqlite2 \ --without-sqlite3 \ - --with-apr='$(PREFIX)/$(TARGET)' \ + --with-apr='$(HOST_PREFIX)' \ CFLAGS=-D_WIN32_WINNT=0x0500 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= - $(LN_SF) '$(PREFIX)/$(TARGET)/bin/apu-1-config' '$(PREFIX)/bin/$(TARGET)-apu-1-config' + $(LN_SF) '$(HOST_PREFIX)/bin/apu-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-apu-1-config' endef
--- a/src/apr.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/apr.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ @@ -28,5 +28,5 @@ ac_cv_sizeof_ssize_t=4 \ CFLAGS=-D_WIN32_WINNT=0x0500 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= - $(LN_SF) '$(PREFIX)/$(TARGET)/bin/apr-1-config' '$(PREFIX)/bin/$(TARGET)-apr-1-config' + $(LN_SF) '$(HOST_PREFIX)/bin/apr-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-apr-1-config' endef
--- a/src/armadillo.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/armadillo.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,7 +23,7 @@ # note: don't use -Werror with GCC 4.7.0 and .1 '$(TARGET)-g++' \ -W -Wall \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-armadillo.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-armadillo.exe' \ -larmadillo -llapack -lblas -lgfortran -lboost_serialization-mt -lboost_thread_win32-mt -lboost_system-mt endef
--- a/src/arpack.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/arpack.mk Sun Jun 02 10:31:04 2013 -0400 @@ -26,7 +26,7 @@ --build="`config.guess`" \ --enable-static --disable-shared \ $($(PKG)_CONFIGURE_PIC_OPTION) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)/.build' -j '$(JOBS)' if [ $(BUILD_STATIC) = yes ]; then \
--- a/src/atk.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/atk.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-glibtest \ --disable-gtk-doc $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/atkmm.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/atkmm.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/aubio.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/aubio.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-jack \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ PYTHON='no' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/bfd.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/bfd.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ cd '$(1)/bfd' && ./configure \ --host='$(TARGET)' \ --target='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-install-libbfd \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)/bfd' -j '$(JOBS)'
--- a/src/binutils.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/binutils.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,17 +20,17 @@ ifneq ($(USE_SYSTEM_GCC),yes) define $(PKG)_BUILD # install config.guess for general use - $(INSTALL) -d '$(PREFIX)/bin' - $(INSTALL) -m755 '$(1)/config.guess' '$(PREFIX)/bin/' + $(INSTALL) -d '$(BUILD_TOOLS_PREFIX)/bin' + $(INSTALL) -m755 '$(1)/config.guess' '$(BUILD_TOOLS_PREFIX)/bin/' # install target-specific autotools config file - $(INSTALL) -d '$(PREFIX)/$(TARGET)/share' - echo "ac_cv_build=`$(1)/config.guess`" > '$(PREFIX)/$(TARGET)/share/config.site' + $(INSTALL) -d '$(HOST_PREFIX)/share' + echo "ac_cv_build=`$(1)/config.guess`" > '$(HOST_PREFIX)/share/config.site' cd '$(1)' && ./configure \ --target='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)' \ + --prefix='$(BUILD_TOOLS_PREFIX)' \ --with-gcc \ --with-gnu-ld \ --with-gnu-as \ @@ -39,7 +39,7 @@ --disable-werror $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - $(MAKE) -C '$(1)' -j 1 DESTDIR=$(PREFIX)/../cross-tools install + $(MAKE) -C '$(1)' -j 1 DESTDIR=$(TOP_DIR)/cross-tools install endef else define $(PKG)_BUILD
--- a/src/boost.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/boost.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ # context switched library introduced in boost 1.51.0 does not build rm -r '$(1)/libs/context' # old version appears to interfere - rm -rf '$(PREFIX)/$(TARGET)/include/boost/' + rm -rf '$(HOST_PREFIX)/include/boost/' echo 'using gcc : : $(TARGET)-g++ : <rc>$(TARGET)-windres <archiver>$(TARGET)-ar ;' > '$(1)/user-config.jam' # compile boost jam cd '$(1)/tools/build/v2/engine' && ./build.sh @@ -35,17 +35,17 @@ --layout=tagged \ --without-mpi \ --without-python \ - --prefix='$(PREFIX)/$(TARGET)' \ - --exec-prefix='$(PREFIX)/$(TARGET)/bin' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ - --includedir='$(PREFIX)/$(TARGET)/include' \ - -sEXPAT_INCLUDE='$(PREFIX)/$(TARGET)/include' \ - -sEXPAT_LIBPATH='$(PREFIX)/$(TARGET)/lib' \ + --prefix='$(HOST_PREFIX)' \ + --exec-prefix='$(HOST_PREFIX)/bin' \ + --libdir='$(HOST_PREFIX)/lib' \ + --includedir='$(HOST_PREFIX)/include' \ + -sEXPAT_INCLUDE='$(HOST_PREFIX)/include' \ + -sEXPAT_LIBPATH='$(HOST_PREFIX)/lib' \ stage install '$(TARGET)-g++' \ -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-boost.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-boost.exe' \ -DBOOST_THREAD_USE_LIB \ -lboost_serialization-mt \ -lboost_thread_win32-mt \
--- a/src/build-autoconf.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/build-autoconf.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)' + --prefix='$(BUILD_TOOLS_PREFIX)' $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install endef
--- a/src/build-automake.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/build-automake.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)' + --prefix='$(BUILD_TOOLS_PREFIX)' $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install endef
--- a/src/build-bison.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/build-bison.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)' + --prefix='$(BUILD_TOOLS_PREFIX)' $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install endef
--- a/src/build-cmake.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/build-cmake.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)' + --prefix='$(BUILD_TOOLS_PREFIX)' $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install endef
--- a/src/build-flex.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/build-flex.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)' + --prefix='$(BUILD_TOOLS_PREFIX)' $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install endef
--- a/src/build-gperf.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/build-gperf.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)' + --prefix='$(BUILD_TOOLS_PREFIX)' $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install endef
--- a/src/build-libtool.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/build-libtool.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)' + --prefix='$(BUILD_TOOLS_PREFIX)' $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install endef
--- a/src/build-pkg-config.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/build-pkg-config.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,8 +19,8 @@ cd '$(1).build' && '$(1)/configure' \ --with-internal-glib \ --with-pc-path='$(MXE_LIBDIR)/pkgconfig' \ - --prefix='$(PREFIX)' + --prefix='$(BUILD_TOOLS_PREFIX)' $(MAKE) -C '$(1).build' -j '$(JOBS)' - rm -f "$(PREFIX)/bin/`config.guess`-pkg-config" + rm -f "$(BUILD_TOOLS_PREFIX)/bin/`config.guess`-pkg-config" $(MAKE) -C '$(1).build' -j 1 install endef
--- a/src/build-texinfo.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/build-texinfo.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,7 +17,15 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)' - $(MAKE) -C '$(1).build' -j '$(JOBS)' - $(MAKE) -C '$(1).build' -j 1 install + --prefix='$(BUILD_TOOLS_PREFIX)' + + $(MAKE) -C '$(1).build/gnulib/lib' -j '$(JOBS)' + $(MAKE) -C '$(1).build/lib' -j '$(JOBS)' + $(MAKE) -C '$(1).build/makeinfo' -j '$(JOBS)' + $(MAKE) -C '$(1).build/util' -j '$(JOBS)' + + $(MAKE) -C '$(1).build/gnulib/lib' -j 1 install + $(MAKE) -C '$(1).build/lib' -j 1 install + $(MAKE) -C '$(1).build/makeinfo' -j 1 install + $(MAKE) -C '$(1).build/util' -j 1 install endef
--- a/src/bzip2.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/bzip2.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ $(SED) -i 's,sys\\stat\.h,sys/stat.h,g' '$(1)/bzip2.c' $(SED) -i 's,WINAPI,,g' '$(1)/bzlib.h' $(MAKE) -C '$(1)' -j '$(JOBS)' libbz2.a \ - PREFIX='$(PREFIX)/$(TARGET)' \ + PREFIX='$(HOST_PREFIX)' \ CC='$(MXE_CC)' \ AR='$(MXE_AR)' \ RANLIB='$(MXE_RANLIB)' @@ -37,7 +37,7 @@ $(SED) -i 's,sys\\stat\.h,sys/stat.h,g' '$(1)/bzip2.c' $(SED) -i 's,WINAPI,,g' '$(1)/bzlib.h' $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile-libbz2_so \ - PREFIX='$(PREFIX)/$(TARGET)' \ + PREFIX='$(HOST_PREFIX)' \ CC='$(MXE_CC)' \ AR='$(MXE_AR)' \ RANLIB='$(MXE_RANLIB)'
--- a/src/cairo.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/cairo.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-gtk-doc \ --disable-test-surfaces \ --disable-gcov \
--- a/src/cairomm.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/cairomm.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/cblas.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/cblas.mk Sun Jun 02 10:31:04 2013 -0400 @@ -25,9 +25,9 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' alllib cd '$(1)' && $(TARGET)-ar cr libcblas.a src/*.o - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/libcblas.a' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/include/cblas.h' '$(PREFIX)/$(TARGET)/include/' - $(INSTALL) -m644 '$(1)/include/cblas_f77.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -d '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)/libcblas.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -m644 '$(1)/include/cblas.h' '$(HOST_PREFIX)/include/' + $(INSTALL) -m644 '$(1)/include/cblas_f77.h' '$(HOST_PREFIX)/include/' endef
--- a/src/cgal.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/cgal.mk Sun Jun 02 10:31:04 2013 -0400 @@ -43,5 +43,5 @@ $(MAKE) -C '$(1)/examples/AABB_tree' -j $(JOBS) $(MAKE) -C '$(1)' -j $(JOBS) install - $(INSTALL) '$(1)/examples/AABB_tree/AABB_polyhedron_edge_example.exe' '$(PREFIX)/$(TARGET)/bin/test-cgal.exe' + $(INSTALL) '$(1)/examples/AABB_tree/AABB_polyhedron_edge_example.exe' '$(HOST_PREFIX)/bin/test-cgal.exe' endef
--- a/src/cminpack.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/cminpack.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,8 +20,8 @@ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)' -j $(JOBS) - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/libcminpack.a' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/cminpack.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -d '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)/libcminpack.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -m644 '$(1)/cminpack.h' '$(HOST_PREFIX)/include/' endef
--- a/src/cppunit.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/cppunit.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-doxygen \ --disable-dot \ --disable-html-docs \
--- a/src/cunit.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/cunit.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,6 +19,6 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA= endef
--- a/src/curl.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/curl.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --with-gnutls \ --with-libidn \ --enable-sspi \ @@ -31,7 +31,7 @@ ## '$(TARGET)-gcc' \ ## -W -Wall -Werror -ansi -pedantic \ -## '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-curl.exe' \ +## '$(2).c' -o '$(HOST_PREFIX)/bin/test-curl.exe' \ ## `'$(TARGET)-pkg-config' libcurl --cflags --libs` endef
--- a/src/dbus.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/dbus.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --with-xml=expat \ --disable-tests \ --disable-verbose-mode \
--- a/src/dcmtk.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/dcmtk.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,12 +19,12 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --with-openssl \ --with-libtiff \ --with-libpng \ --with-libxml \ - --with-libxmlinc='$(PREFIX)/$(TARGET)' \ + --with-libxmlinc='$(HOST_PREFIX)' \ --with-zlib \ --without-libwrap \ CXX='$(TARGET)-g++' \
--- a/src/devil.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/devil.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-ILU \ --enable-ILUT \ --disable-allegro \
--- a/src/exiv2.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/exiv2.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-visibility \ --disable-nls \ --with-expat
--- a/src/expat.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/expat.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,6 +20,6 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/faad2.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/faad2.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install
--- a/src/ffmpeg.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/ffmpeg.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,7 +23,7 @@ --enable-cross-compile \ --arch=i686 \ --target-os=mingw32 \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --disable-doc \
--- a/src/fftw.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/fftw.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-threads \ --enable-double $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= @@ -32,7 +32,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-threads \ --enable-long-double $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= @@ -42,7 +42,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-threads \ --enable-float $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/file.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/file.mk Sun Jun 02 10:31:04 2013 -0400 @@ -30,12 +30,12 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= FILE_COMPILE='$(1).native/src/file' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-file.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-file.exe' \ -lmagic -lgnurx -lshlwapi endef
--- a/src/flac.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/flac.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-doxygen-docs \ --disable-xmms-plugin \ --enable-cpplibs \
--- a/src/fltk.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/fltk.mk Sun Jun 02 10:31:04 2013 -0400 @@ -25,15 +25,15 @@ ## $(SED) -i 's,\$$uname,MINGW,g' '$(1)/configure' cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - DSOFLAGS='-L$(PREFIX)/$(TARGET)/lib' \ + DSOFLAGS='-L$(HOST_PREFIX)/lib' \ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-threads ## LIBS='-lws2_32' # enable exceptions, because disabling them doesn't make any sense on PCs $(SED) -i 's,-fno-exceptions,,' '$(1)/makeinclude' $(MAKE) -C '$(1)' -j '$(JOBS)' install DIRS=src LIBCOMMAND='$(MXE_AR) cr' - $(LN_SF) '$(MXE_BINDIR)/fltk-config' '$(PREFIX)/bin/$(TARGET)-fltk-config' + $(LN_SF) '$(MXE_BINDIR)/fltk-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-fltk-config' endef
--- a/src/fontconfig.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/fontconfig.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,15 +18,15 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - FREETYPE_CFLAGS='-I$(PREFIX)/$(TARGET)/include/freetype2' \ + FREETYPE_CFLAGS='-I$(HOST_PREFIX)/include/freetype2' \ FREETYPE_LIBS='-lfreetype' \ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --with-arch='$(TARGET)' \ --disable-docs \ - --with-expat='$(PREFIX)/$(TARGET)' + --with-expat='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/freeglut.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/freeglut.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-replace-glut \ --disable-debug \ --without-progs \ @@ -29,6 +29,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-freeglut.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-freeglut.exe' \ `'$(TARGET)-pkg-config' glut --cflags --libs` endef
--- a/src/freeimage.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/freeimage.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,13 +22,13 @@ CXX='$(TARGET)-g++' \ CC='$(TARGET)-gcc' \ AR='$(TARGET)-ar' \ - INCDIR='$(PREFIX)/$(TARGET)/include' \ - INSTALLDIR='$(PREFIX)/$(TARGET)/lib' + INCDIR='$(HOST_PREFIX)/include' \ + INSTALLDIR='$(HOST_PREFIX)/lib' $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile.gnu install \ CXX='$(TARGET)-g++' \ CC='$(TARGET)-gcc' \ AR='$(TARGET)-ar' \ - INCDIR='$(PREFIX)/$(TARGET)/include' \ - INSTALLDIR='$(PREFIX)/$(TARGET)/lib' + INCDIR='$(HOST_PREFIX)/include' \ + INSTALLDIR='$(HOST_PREFIX)/lib' endef
--- a/src/freetds.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/freetds.mk Sun Jun 02 10:31:04 2013 -0400 @@ -24,7 +24,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ --build="`config.guess`" \ --disable-rpath \
--- a/src/freetype.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/freetype.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install rm -f $(MXE_LIBDIR)/libfreetype.la
--- a/src/fribidi.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/fribidi.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-debug \ --disable-deprecated \ --enable-charsets \
--- a/src/ftgl.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/ftgl.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,10 +23,10 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --without-x \ --disable-freetypetest \ - --with-ft-prefix='$(PREFIX)/$(TARGET)' + --with-ft-prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/gc.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gc.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --enable-threads=win32 \ --enable-cplusplus
--- a/src/gcc.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gcc.mk Sun Jun 02 10:31:04 2013 -0400 @@ -12,18 +12,26 @@ $(PKG)_DEPS := else ifeq ($(MXE_NATIVE_BUILD),yes) - $(PKG)_DEPS := binutils gcc-gmp gcc-mpc gcc-mpfr + $(PKG)_DEPS := binutils else ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_DEPS := mingwrt w32api binutils gcc-gmp gcc-mpc gcc-mpfr - else + $(PKG)_DEPS := mingwrt w32api binutils endif endif endif + ifneq ($(BUILD_SHARED),yes) -$(PKG)_STATIC_FLAG := --static + $(PKG)_STATIC_FLAG := --static endif +ifeq ($(MXE_SYSTEM),mingw) + $(PKG)_SYSDEP_CONFIGURE_OPTIONS := \ + --disable-sjlj-exceptions \ + --disable-win32-registry \ + --enable-threads=win32 +endif + + define $(PKG)_UPDATE $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \ $(SED) -n 's,.*<a href="gcc-\([0-9][^"]*\)/".*,\1,p' | \ @@ -50,7 +58,7 @@ echo 'set(BUILD_STATIC_LIBS OFF)'; \ fi; \ echo 'set(CMAKE_BUILD_TYPE Release)'; \ - echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \ + echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX))'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)'; \ @@ -60,53 +68,41 @@ echo 'set(CMAKE_RC_COMPILER $(MXE_WINDRES))'; \ echo 'set(PKG_CONFIG_EXECUTABLE $(MXE_PKG_CONFIG))'; \ echo 'set(QT_QMAKE_EXECUTABLE $(MXE_QMAKE))'; \ - echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ + echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX) CACHE PATH "Installation Prefix")'; \ echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ > '$(CMAKE_TOOLCHAIN_FILE)' endef else define $(PKG)_BUILD - # unpack support libraries - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-gmp) - mv '$(1)/$(gcc-gmp_SUBDIR)' '$(1)/gmp' - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpc) - mv '$(1)/$(gcc-mpc_SUBDIR)' '$(1)/mpc' - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpfr) - mv '$(1)/$(gcc-mpfr_SUBDIR)' '$(1)/mpfr' - - # build GCC and support libraries + cd '$(1)' && ./contrib/download_prerequisites mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ --target='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)' \ - --libdir='$(PREFIX)/lib' \ - --enable-languages='c,c++,objc,fortran' \ + --prefix='$(BUILD_TOOLS_PREFIX)' \ + --libdir='$(BUILD_TOOLS_PREFIX)/lib' \ + --enable-languages='c,c++,fortran' \ --enable-version-specific-runtime-libs \ --with-gcc \ --with-gnu-ld \ --with-gnu-as \ --disable-nls \ $(ENABLE_SHARED_OR_STATIC) \ - --disable-sjlj-exceptions \ --without-x \ - --disable-win32-registry \ - --enable-threads=win32 \ + $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \ --disable-libgomp \ --disable-libmudflap \ - --with-mpfr-include='$(1)/mpfr/src' \ - --with-mpfr-lib='$(1).build/mpfr/src/.libs' \ $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'") $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install - mkdir -p $(PREFIX)/../cross-tools/$(MXE_BINDIR) - $(MAKE) -C '$(1).build' -j 1 DESTDIR=$(PREFIX)/../cross-tools install + mkdir -p $(TOP_DIR)/cross-tools/$(MXE_BINDIR) + $(MAKE) -C '$(1).build' -j 1 DESTDIR=$(TOP_DIR)/cross-tools install # create pkg-config script (echo '#!/bin/sh'; \ echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(MXE_LIBDIR)/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG) "$$@"') \ - > '$(PREFIX)/bin/$(TARGET)-pkg-config' - chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config' + > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' + chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' # create the CMake toolchain file [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' @@ -123,17 +119,17 @@ echo 'set(BUILD_STATIC_LIBS OFF)'; \ fi; \ echo 'set(CMAKE_BUILD_TYPE Release)'; \ - echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \ + echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX))'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)'; \ - echo 'set(CMAKE_C_COMPILER $(PREFIX)/bin/$(TARGET)-gcc)'; \ - echo 'set(CMAKE_CXX_COMPILER $(PREFIX)/bin/$(TARGET)-g++)'; \ - echo 'set(CMAKE_Fortran_COMPILER $(PREFIX)/bin/$(TARGET)-gfortran)'; \ - echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \ - echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ - echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/bin/$(TARGET)-qmake)'; \ - echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ + echo 'set(CMAKE_C_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gcc)'; \ + echo 'set(CMAKE_CXX_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-g++)'; \ + echo 'set(CMAKE_Fortran_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gfortran)'; \ + echo 'set(CMAKE_RC_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-windres)'; \ + echo 'set(PKG_CONFIG_EXECUTABLE $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config)'; \ + echo 'set(QT_QMAKE_EXECUTABLE $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake)'; \ + echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX) CACHE PATH "Installation Prefix")'; \ echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ > '$(CMAKE_TOOLCHAIN_FILE)' endef
--- a/src/gd.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gd.mk Sun Jun 02 10:31:04 2013 -0400 @@ -30,17 +30,17 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-freetype='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + --with-freetype='$(HOST_PREFIX)' \ --without-x \ - LIBPNG_CONFIG='$(PREFIX)/$(TARGET)/bin/libpng-config' \ - CFLAGS='-DNONDLL -DXMD_H -L$(PREFIX)/$(TARGET)/lib' \ - LIBS="`$(PREFIX)/$(TARGET)/bin/xml2-config --libs`" + LIBPNG_CONFIG='$(HOST_PREFIX)/bin/libpng-config' \ + CFLAGS='-DNONDLL -DXMD_H -L$(HOST_PREFIX)/lib' \ + LIBS="`$(HOST_PREFIX)/bin/xml2-config --libs`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gd.exe' \ - `'$(PREFIX)/$(TARGET)/bin/gdlib-config' --cflags` \ - -lgd `'$(PREFIX)/$(TARGET)/bin/gdlib-config' --libs` + '$(2).c' -o '$(HOST_PREFIX)/bin/test-gd.exe' \ + `'$(HOST_PREFIX)/bin/gdlib-config' --cflags` \ + -lgd `'$(HOST_PREFIX)/bin/gdlib-config' --libs` endef
--- a/src/gdal.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gdal.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,26 +22,26 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --with-bsb \ --with-grib \ --with-ogr \ --with-vfk \ --with-pam \ --without-threads \ - --with-libz='$(PREFIX)/$(TARGET)' \ - --with-png='$(PREFIX)/$(TARGET)' \ - --with-libtiff='$(PREFIX)/$(TARGET)' \ - --with-geotiff='$(PREFIX)/$(TARGET)' \ - --with-jpeg='$(PREFIX)/$(TARGET)' \ - --with-jasper='$(PREFIX)/$(TARGET)' \ - --with-gif='$(PREFIX)/$(TARGET)' \ - --with-expat='$(PREFIX)/$(TARGET)' \ - --with-sqlite3='$(PREFIX)/$(TARGET)' \ - --with-curl='$(PREFIX)/$(TARGET)/bin/curl-config' \ - --with-geos='$(PREFIX)/$(TARGET)/bin/geos-config' \ - --with-pg='$(PREFIX)/bin/$(TARGET)-pg_config' \ - --with-gta='$(PREFIX)/$(TARGET)' \ + --with-libz='$(HOST_PREFIX)' \ + --with-png='$(HOST_PREFIX)' \ + --with-libtiff='$(HOST_PREFIX)' \ + --with-geotiff='$(HOST_PREFIX)' \ + --with-jpeg='$(HOST_PREFIX)' \ + --with-jasper='$(HOST_PREFIX)' \ + --with-gif='$(HOST_PREFIX)' \ + --with-expat='$(HOST_PREFIX)' \ + --with-sqlite3='$(HOST_PREFIX)' \ + --with-curl='$(HOST_PREFIX)/bin/curl-config' \ + --with-geos='$(HOST_PREFIX)/bin/geos-config' \ + --with-pg='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' \ + --with-gta='$(HOST_PREFIX)' \ --without-odbc \ --without-static-proj4 \ --without-xerces \ @@ -82,5 +82,5 @@ $(MAKE) -C '$(1)/alg' -j 1 install $(MAKE) -C '$(1)/ogr' -j 1 install OGR_ENABLED= $(MAKE) -C '$(1)/apps' -j 1 install BIN_LIST= - $(LN_SF) '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config' + $(LN_SF) '$(HOST_PREFIX)/bin/gdal-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gdal-config' endef
--- a/src/gdb.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gdb.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ CONFIG_SHELL=$(SHELL) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install
--- a/src/gdk-pixbuf.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gdk-pixbuf.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-modules \ --with-included-loaders \ --without-gdiplus \
--- a/src/geos.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/geos.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,11 +21,11 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-geos.exe' \ - -lgeos_c `'$(PREFIX)/$(TARGET)/bin/geos-config' --cflags --libs` -lstdc++ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-geos.exe' \ + -lgeos_c `'$(HOST_PREFIX)/bin/geos-config' --cflags --libs` -lstdc++ endef
--- a/src/gettext.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gettext.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)/gettext-runtime' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-threads=win32 \ --without-libexpat-prefix \ --without-libxml2-prefix \
--- a/src/giflib.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/giflib.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,7 +23,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ CPPFLAGS='-D_OPEN_BINARY' echo 'all:' > '$(1)/doc/Makefile'
--- a/src/glew.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/glew.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,10 +21,10 @@ cd '$(1)' && $(TARGET)-ar cr libGLEW.a glew.o $(TARGET)-ranlib '$(1)/libGLEW.a' $(SED) \ - -e "s|@prefix@|$(PREFIX)/$(TARGET)|g" \ - -e "s|@libdir@|$(PREFIX)/$(TARGET)/lib|g" \ - -e "s|@exec_prefix@|$(PREFIX)/$(TARGET)/bin|g" \ - -e "s|@includedir@|$(PREFIX)/$(TARGET)/include/GL|g" \ + -e "s|@prefix@|$(HOST_PREFIX)|g" \ + -e "s|@libdir@|$(HOST_PREFIX)/lib|g" \ + -e "s|@exec_prefix@|$(HOST_PREFIX)/bin|g" \ + -e "s|@includedir@|$(HOST_PREFIX)/include/GL|g" \ -e "s|@version@|$(glew_VERSION)|g" \ -e "s|@cflags@|-DGLEW_STATIC|g" \ -e "s|-l@libname@|-lGLEW -lopengl32|g" \ @@ -35,34 +35,34 @@ cd '$(1)' && $(TARGET)-ar cr libGLEWmx.a glewmx.o $(TARGET)-ranlib '$(1)/libGLEWmx.a' $(SED) \ - -e "s|@prefix@|$(PREFIX)/$(TARGET)|g" \ - -e "s|@libdir@|$(PREFIX)/$(TARGET)/lib|g" \ - -e "s|@exec_prefix@|$(PREFIX)/$(TARGET)/bin|g" \ - -e "s|@includedir@|$(PREFIX)/$(TARGET)/include/GL|g" \ + -e "s|@prefix@|$(HOST_PREFIX)|g" \ + -e "s|@libdir@|$(HOST_PREFIX)/lib|g" \ + -e "s|@exec_prefix@|$(HOST_PREFIX)/bin|g" \ + -e "s|@includedir@|$(HOST_PREFIX)/include/GL|g" \ -e "s|@version@|$(glew_VERSION)|g" \ -e "s|@cflags@|-DGLEW_STATIC -DGLEW_MX|g" \ -e "s|-l@libname@|-lGLEWmx -lopengl32|g" \ < '$(1)'/glew.pc.in > '$(1)'/glewmx.pc # Install - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/libGLEW.a' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -m644 '$(1)/libGLEW.a' '$(PREFIX)/$(TARGET)/lib/libglew32s.a' - $(INSTALL) -m644 '$(1)/libGLEWmx.a' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' - $(INSTALL) -m644 '$(1)/glew.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/' - $(INSTALL) -m644 '$(1)/glewmx.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/GL' - $(INSTALL) -m644 '$(1)/include/GL/glew.h' '$(1)/include/GL/wglew.h' '$(PREFIX)/$(TARGET)/include/GL/' + $(INSTALL) -d '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)/libGLEW.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -m644 '$(1)/libGLEW.a' '$(HOST_PREFIX)/lib/libglew32s.a' + $(INSTALL) -m644 '$(1)/libGLEWmx.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -d '$(HOST_PREFIX)/lib/pkgconfig' + $(INSTALL) -m644 '$(1)/glew.pc' '$(HOST_PREFIX)/lib/pkgconfig/' + $(INSTALL) -m644 '$(1)/glewmx.pc' '$(HOST_PREFIX)/lib/pkgconfig/' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -d '$(HOST_PREFIX)/include/GL' + $(INSTALL) -m644 '$(1)/include/GL/glew.h' '$(1)/include/GL/wglew.h' '$(HOST_PREFIX)/include/GL/' # Test '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-glew.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-glew.exe' \ `'$(TARGET)-pkg-config' glew --cflags --libs` '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-glewmx.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-glewmx.exe' \ `'$(TARGET)-pkg-config' glewmx --cflags --libs` endef
--- a/src/glib.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/glib.mk Sun Jun 02 10:31:04 2013 -0400 @@ -28,7 +28,7 @@ # native build for glib-genmarshal, without pkg-config, gettext and zlib cd '$(1).native' && ./configure \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-regex \ --disable-threads \ --disable-selinux \ @@ -48,19 +48,19 @@ $(MAKE) -C '$(1).native/gio/xdgmime' -j '$(JOBS)' $(MAKE) -C '$(1).native/gio' -j '$(JOBS)' glib-compile-schemas $(MAKE) -C '$(1).native/gio' -j '$(JOBS)' glib-compile-resources - $(INSTALL) -m755 '$(1).native/gio/glib-compile-schemas' '$(PREFIX)/$(TARGET)/bin/' - $(INSTALL) -m755 '$(1).native/gio/glib-compile-resources' '$(PREFIX)/$(TARGET)/bin/' + $(INSTALL) -m755 '$(1).native/gio/glib-compile-schemas' '$(HOST_PREFIX)/bin/' + $(INSTALL) -m755 '$(1).native/gio/glib-compile-resources' '$(HOST_PREFIX)/bin/' endef define $(PKG)_SYMLINK - $(LN_SF) `which glib-genmarshal` '$(PREFIX)/$(TARGET)/bin/' - $(LN_SF) `which glib-compile-schemas` '$(PREFIX)/$(TARGET)/bin/' - $(LN_SF) `which glib-compile-resources` '$(PREFIX)/$(TARGET)/bin/' + $(LN_SF) `which glib-genmarshal` '$(HOST_PREFIX)/bin/' + $(LN_SF) `which glib-compile-schemas` '$(HOST_PREFIX)/bin/' + $(LN_SF) `which glib-compile-resources` '$(HOST_PREFIX)/bin/' endef define $(PKG)_BUILD cd '$(1)' && ./autogen.sh - rm -f '$(PREFIX)/$(TARGET)/bin/glib-*' + rm -f '$(HOST_PREFIX)/bin/glib-*' $(if $(findstring y,\ $(shell [ -x "`which glib-genmarshal`" ] && \ [ -x "`which glib-compile-schemas`" ] && \ @@ -72,16 +72,16 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --with-threads=win32 \ --with-pcre=system \ --with-libiconv=gnu \ --disable-inotify \ CXX='$(TARGET)-c++' \ - PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ - GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' \ - GLIB_COMPILE_SCHEMAS='$(PREFIX)/$(TARGET)/bin/glib-compile-schemas' \ - GLIB_COMPILE_RESOURCES='$(PREFIX)/$(TARGET)/bin/glib-compile-resources' + PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' \ + GLIB_GENMARSHAL='$(HOST_PREFIX)/bin/glib-genmarshal' \ + GLIB_COMPILE_SCHEMAS='$(HOST_PREFIX)/bin/glib-compile-schemas' \ + GLIB_COMPILE_RESOURCES='$(HOST_PREFIX)/bin/glib-compile-resources' $(MAKE) -C '$(1)/glib' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)/gmodule' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)/gthread' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/glibmm.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/glibmm.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,10 +21,10 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ CXX='$(TARGET)-c++' \ - PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ - GLIB_COMPILE_SCHEMAS='$(PREFIX)/$(TARGET)/bin/glib-compile-schemas' \ + PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' \ + GLIB_COMPILE_SCHEMAS='$(HOST_PREFIX)/bin/glib-compile-schemas' \ MAKE=$(MAKE) $(MAKE) -C '$(1)/gio/src' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= MISC_STUFF= $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/glpk.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/glpk.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,6 +22,6 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install endef
--- a/src/gmp.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gmp.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ cd '$(1)' && CC_FOR_BUILD=gcc ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --enable-cxx \ --without-readline
--- a/src/gnuplot.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gnuplot.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,20 +20,20 @@ make -C '$(1)/config/mingw' CC='$(TARGET)-gcc' CXX='$(TARGET)-g++' RC='$(TARGET)-windres' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe make -C '$(1)/config/mingw' CC='$(TARGET)-gcc' CXX='$(TARGET)-g++' RC='$(TARGET)-windres' -j '$(JOBS)' wgnuplot.mnu - $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin' - $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(PREFIX)/$(TARGET)/bin/' - $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(PREFIX)/$(TARGET)/bin/' - $(INSTALL) -m644 '$(1)/config/mingw/wgnuplot.mnu' '$(PREFIX)/$(TARGET)/bin/' + $(INSTALL) -d '$(HOST_PREFIX)/bin' + $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(HOST_PREFIX)/bin/' + $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(HOST_PREFIX)/bin/' + $(INSTALL) -m644 '$(1)/config/mingw/wgnuplot.mnu' '$(HOST_PREFIX)/bin/' - $(INSTALL) -d '$(PREFIX)/../gnuplot/bin' - $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(PREFIX)/../gnuplot/bin/' - $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(PREFIX)/../gnuplot/bin/' - $(INSTALL) -m644 '$(1)/config/mingw/wgnuplot.mnu' '$(PREFIX)/../gnuplot/bin/' + $(INSTALL) -d '$(TOP_DIR)/gnuplot/bin' + $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(TOP_DIR)/gnuplot/bin/' + $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(TOP_DIR)/gnuplot/bin/' + $(INSTALL) -m644 '$(1)/config/mingw/wgnuplot.mnu' '$(TOP_DIR)/gnuplot/bin/' endef else define $(PKG)_BUILD - cd '$(1)' && ./configure --prefix '$(PREFIX)/$(TARGET)' + cd '$(1)' && ./configure --prefix '$(HOST_PREFIX)' make -C '$(1)' -j '$(JOBS)' install endef endif
--- a/src/gnutls.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gnutls.mk Sun Jun 02 10:31:04 2013 -0400 @@ -29,7 +29,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-nls \ --disable-guile \ --with-included-libtasn1 \
--- a/src/graphicsmagick.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/graphicsmagick.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --without-modules \ --with-threads \ --with-magick-plus-plus \ @@ -38,13 +38,13 @@ --with-png \ --with-tiff \ --without-trio \ - --with-ttf='$(PREFIX)/$(TARGET)' \ + --with-ttf='$(HOST_PREFIX)' \ --without-wmf \ --with-xml \ --with-zlib \ --without-x \ - ac_cv_prog_xml2_config='$(PREFIX)/$(TARGET)/bin/xml2-config' \ - ac_cv_path_xml2_config='$(PREFIX)/$(TARGET)/bin/xml2-config' + ac_cv_prog_xml2_config='$(HOST_PREFIX)/bin/xml2-config' \ + ac_cv_path_xml2_config='$(HOST_PREFIX)/bin/xml2-config' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= endef
--- a/src/gsl.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gsl.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,13 +20,13 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gsl.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-gsl.exe' \ -lgsl endef
--- a/src/gsoap.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gsoap.mk Sun Jun 02 10:31:04 2013 -0400 @@ -27,8 +27,8 @@ $(MAKE) -C '$(1)'/gsoap -j '$(JOBS)' # Install the native tools manually - $(INSTALL) -m755 '$(1)'/gsoap/wsdl/wsdl2h '$(PREFIX)/bin/$(TARGET)-wsdl2h' - $(INSTALL) -m755 '$(1)'/gsoap/src/soapcpp2 '$(PREFIX)/bin/$(TARGET)-soapcpp2' + $(INSTALL) -m755 '$(1)'/gsoap/wsdl/wsdl2h '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wsdl2h' + $(INSTALL) -m755 '$(1)'/gsoap/src/soapcpp2 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-soapcpp2' $(MAKE) -C '$(1)' -j '$(JOBS)' clean @@ -39,14 +39,14 @@ # Prevent undefined reference to _rpl_malloc. # http://groups.google.com/group/ikarus-users/browse_thread/thread/fd1d101eac32633f cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ --build="`config.guess`" \ --enable-gnutls \ CPPFLAGS='-DWITH_NTLM' # Building for mingw requires native soapcpp2 - $(LN_SF) '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)/gsoap/src/soapcpp2' + $(LN_SF) '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)/gsoap/src/soapcpp2' # Work around parallel build problem $(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h AR='$(TARGET)-ar' @@ -56,5 +56,5 @@ # Apparently there is a tradition of compiling gsoap source files into applications. # Since we linked dom.cpp and dom.c into the libraries, this should not be necessary. # But we bend to tradition and install these sources into MXE. - $(INSTALL) -m644 '$(1)/gsoap/'*.c '$(1)/gsoap/'*.cpp '$(PREFIX)/$(TARGET)/share/gsoap' + $(INSTALL) -m644 '$(1)/gsoap/'*.c '$(1)/gsoap/'*.cpp '$(HOST_PREFIX)/share/gsoap' endef
--- a/src/gst-plugins-base.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gst-plugins-base.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,12 +17,12 @@ define $(PKG)_BUILD find '$(1)' -name Makefile.in \ - -exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' {} \; \ - -exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \; + -exec $(SED) -i 's,glib-mkenums,$(HOST_PREFIX)/bin/glib-mkenums,g' {} \; \ + -exec $(SED) -i 's,glib-genmarshal,$(HOST_PREFIX)/bin/glib-genmarshal,g' {} \; cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --disable-examples \
--- a/src/gst-plugins-good.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gst-plugins-good.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,15 +17,15 @@ define $(PKG)_BUILD find '$(1)' -name Makefile.in \ - -exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' {} \; \ - -exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \; + -exec $(SED) -i 's,glib-mkenums,$(HOST_PREFIX)/bin/glib-mkenums,g' {} \; \ + -exec $(SED) -i 's,glib-genmarshal,$(HOST_PREFIX)/bin/glib-genmarshal,g' {} \; # The value for WAVE_FORMAT_DOLBY_AC3_SPDIF comes from vlc and mplayer: # http://www.videolan.org/developers/vlc/doc/doxygen/html/vlc__codecs_8h-source.html # http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2004-August/019283.html cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --disable-examples \
--- a/src/gstreamer.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gstreamer.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,12 +16,12 @@ endef define $(PKG)_BUILD - $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' '$(1)'/gst/Makefile.in - $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' '$(1)'/gst/Makefile.in + $(SED) -i 's,glib-mkenums,$(HOST_PREFIX)/bin/glib-mkenums,g' '$(1)'/gst/Makefile.in + $(SED) -i 's,glib-genmarshal,$(HOST_PREFIX)/bin/glib-genmarshal,g' '$(1)'/gst/Makefile.in cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --disable-check \
--- a/src/gta.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gta.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,12 +22,12 @@ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ --disable-reference \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install dist_doc_DATA= '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gta.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-gta.exe' \ `'$(TARGET)-pkg-config' gta --cflags --libs` endef
--- a/src/gtk2.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gtk2.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,7 +23,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-explicit-deps \ --disable-glibtest \ --disable-modules \ @@ -37,6 +37,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gtk2.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-gtk2.exe' \ `'$(TARGET)-pkg-config' gtk+-2.0 --cflags --libs` endef
--- a/src/gtkglarea.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gtkglarea.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/gtkglext.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gtkglext.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --without-x \ --with-gdktarget=win32 \ @@ -39,6 +39,6 @@ '$(TARGET)-gcc' \ -W -Wall -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gtkglext.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-gtkglext.exe' \ `'$(TARGET)-pkg-config' gtkglext-1.0 --cflags --libs` endef
--- a/src/gtkglextmm.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gtkglextmm.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install \ bin_PROGRAMS= \ @@ -31,6 +31,6 @@ '$(TARGET)-g++' \ -W -Wall -Werror -pedantic -std=c++0x \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-gtkglextmm.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-gtkglextmm.exe' \ `'$(TARGET)-pkg-config' gtkglextmm-1.2 --cflags --libs` endef
--- a/src/gtkmm2.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gtkmm2.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,13 +23,13 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_install='# DISABLED: doc-install.pl' '$(TARGET)-g++' \ -W -Wall -Werror -pedantic -std=c++0x \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-gtkmm2.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-gtkmm2.exe' \ `'$(TARGET)-pkg-config' gtkmm-2.4 --cflags --libs` endef
--- a/src/gtksourceview.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gtksourceview.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,10 +21,10 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-gtk-doc \ - GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' \ - GLIB_MKENUMS='$(PREFIX)/$(TARGET)/bin/glib-mkenums' + GLIB_GENMARSHAL='$(HOST_PREFIX)/bin/glib-genmarshal' \ + GLIB_MKENUMS='$(HOST_PREFIX)/bin/glib-mkenums' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/gtksourceviewmm2.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/gtksourceviewmm2.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/guile.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/guile.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,7 +23,7 @@ cd '$(1)' && CC_FOR_BUILD=gcc ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --without-threads \ scm_cv_struct_timespec=no \ @@ -34,6 +34,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-guile.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-guile.exe' \ `'$(TARGET)-pkg-config' guile-1.8 --cflags --libs` endef
--- a/src/harfbuzz.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/harfbuzz.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/hdf5.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/hdf5.mk Sun Jun 02 10:31:04 2013 -0400 @@ -47,7 +47,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-direct-vfd \ $($(PKG)_CROSS_CONFIG_OPTIONS)
--- a/src/hunspell.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/hunspell.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,13 +23,13 @@ --with-warnings \ --without-ui \ --with-readline \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= # Test '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-hunspell.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-hunspell.exe' \ `'$(TARGET)-pkg-config' hunspell --cflags --libs` endef
--- a/src/id3lib.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/id3lib.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/ilmbase.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/ilmbase.mk Sun Jun 02 10:31:04 2013 -0400 @@ -28,7 +28,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-threading \ CONFIG_SHELL=$(SHELL) # do the first build step by hand, because programs are built that
--- a/src/imagemagick.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/imagemagick.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,11 +19,11 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --with-x=no \ --without-zlib \ - ac_cv_prog_freetype_config='$(PREFIX)/$(TARGET)/bin/freetype-config' + ac_cv_prog_freetype_config='$(HOST_PREFIX)/bin/freetype-config' $(SED) -i 's/#define MAGICKCORE_ZLIB_DELEGATE 1//g' '$(1)/magick/magick-config.h' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS=
--- a/src/jasper.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/jasper.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && autoreconf && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-libjpeg \ --disable-opengl \ --without-x
--- a/src/jpeg.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/jpeg.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
--- a/src/json-c.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/json-c.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,14 +19,14 @@ cd '$(1)' && ./autogen.sh cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --build="`config.guess`"\ $(ENABLE_SHARED_OR_STATIC) CFLAGS=-Wno-error $(MAKE) -C '$(1)' -j '$(JOBS)' install - + '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-json-c.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-json-c.exe' \ `'$(TARGET)-pkg-config' json --cflags --libs` endef
--- a/src/lame.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/lame.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install
--- a/src/lcms.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/lcms.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \
--- a/src/lcms1.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/lcms1.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ @@ -27,5 +27,5 @@ --with-zlib $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= - rm -f $(PREFIX)/$(TARGET)/lib/liblcms.la + rm -f $(HOST_PREFIX)/lib/liblcms.la endef
--- a/src/levmar.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/levmar.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,6 +20,6 @@ CC=$(TARGET)-gcc \ AR=$(TARGET)-ar \ RANLIB=$(TARGET)-ranlib - $(INSTALL) -m644 '$(1)/levmar.h' '$(PREFIX)/$(TARGET)/include/' - $(INSTALL) -m644 '$(1)/liblevmar.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -m644 '$(1)/levmar.h' '$(HOST_PREFIX)/include/' + $(INSTALL) -m644 '$(1)/liblevmar.a' '$(HOST_PREFIX)/lib/' endef
--- a/src/libarchive.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libarchive.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,16 +20,16 @@ $(SED) -i '1i#ifndef LIBARCHIVE_STATIC\n#define LIBARCHIVE_STATIC\n#endif' -i '$(1)/libarchive/archive_entry.h' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-bsdtar \ --disable-bsdcpio \ - XML2_CONFIG='$(PREFIX)/$(TARGET)'/bin/xml2-config + XML2_CONFIG='$(HOST_PREFIX)'/bin/xml2-config $(MAKE) -C '$(1)' -j '$(JOBS)' man_MANS= $(MAKE) -C '$(1)' -j 1 install man_MANS= '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libarchive.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-libarchive.exe' \ `'$(TARGET)-pkg-config' --libs-only-l libarchive` endef
--- a/src/libass.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libass.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-enca \ --enable-fontconfig @@ -28,6 +28,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libass.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-libass.exe' \ `'$(TARGET)-pkg-config' libass --cflags --libs` endef
--- a/src/libcroco.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libcroco.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-gtk-doc $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libdnet.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libdnet.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,12 +23,12 @@ $(SED) -i 's,packet32\.h,Packet32.h,g' '$(1)/configure' $(SED) -i 's,packet\.lib,libpacket.a,' '$(1)/configure' $(SED) -i 's,-lpacket,-lpacket -lws2_32,g' '$(1)/configure' - $(SED) -i 's,/usr/include,$(PREFIX)/$(TARGET)/include,g' '$(1)/configure' + $(SED) -i 's,/usr/include,$(HOST_PREFIX)/include,g' '$(1)/configure' $(SED) -i 's,#include <Ntddndis.h>,#include <ddk/ntddndis.h>,' '$(1)/src/eth-win32.c' $(SED) -i 's,-mno-cygwin,,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libevent.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libevent.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,6 +21,6 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA= endef
--- a/src/libf2c.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libf2c.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,6 +20,6 @@ LD=$(TARGET)-ld \ RANLIB=$(TARGET)-ranlib \ CFLAGS='-O -DUSE_CLOCK' - $(INSTALL) -m644 '$(1)/libf2c.a' '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/f2c.h' '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -m644 '$(1)/libf2c.a' '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)/f2c.h' '$(HOST_PREFIX)/include' endef
--- a/src/libffi.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libffi.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,13 +19,13 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)/$(TARGET)' -j '$(JOBS)' $(MAKE) -C '$(1)/$(TARGET)' -j 1 install '$(TARGET)-gcc' \ -W -Wall -Werror -std=c99 -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libffi.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-libffi.exe' \ `'$(TARGET)-pkg-config' libffi --cflags --libs` endef
--- a/src/libgcrypt.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libgcrypt.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(LN_SF) '$(PREFIX)/$(TARGET)/bin/libgcrypt-config' '$(PREFIX)/bin/$(TARGET)-libgcrypt-config' + $(LN_SF) '$(HOST_PREFIX)/bin/libgcrypt-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-libgcrypt-config' endef
--- a/src/libgda.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libgda.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,12 +16,12 @@ endef define $(PKG)_BUILD - $(SED) -i 's,glib-mkenums,'$(PREFIX)/$(TARGET)/bin/glib-mkenums',g' '$(1)/libgda/Makefile.in' - $(SED) -i 's,glib-mkenums,'$(PREFIX)/$(TARGET)/bin/glib-mkenums',g' '$(1)/libgda/sql-parser/Makefile.in' - $(SED) -i 's,glib-mkenums,'$(PREFIX)/$(TARGET)/bin/glib-mkenums',g' '$(1)/libgda-ui/Makefile.in' + $(SED) -i 's,glib-mkenums,'$(HOST_PREFIX)/bin/glib-mkenums',g' '$(1)/libgda/Makefile.in' + $(SED) -i 's,glib-mkenums,'$(HOST_PREFIX)/bin/glib-mkenums',g' '$(1)/libgda/sql-parser/Makefile.in' + $(SED) -i 's,glib-mkenums,'$(HOST_PREFIX)/bin/glib-mkenums',g' '$(1)/libgda-ui/Makefile.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-gtk-doc \ --without-bdb \ @@ -32,7 +32,7 @@ --without-java \ --enable-binreloc \ --disable-crypto \ - GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' + GLIB_GENMARSHAL='$(HOST_PREFIX)/bin/glib-genmarshal' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libgdamm.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libgdamm.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,9 +20,9 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ CXX='$(TARGET)-c++' \ - PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ + PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libgee.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libgee.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libgeotiff.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libgeotiff.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,8 +22,8 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4` -ljpeg -lz" $(MAKE) -C '$(1)' -j 1 all install EXEEXT=.remove-me MAKE='$(MAKE)' - rm -fv '$(PREFIX)/$(TARGET)'/bin/*.remove-me + rm -fv '$(HOST_PREFIX)'/bin/*.remove-me endef
--- a/src/libglade.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libglade.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,8 +20,8 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ - PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' + --prefix='$(HOST_PREFIX)' \ + PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install-exec endef
--- a/src/libgnurx.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libgnurx.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -f Makefile.mxe -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -f Makefile.mxe -j '$(JOBS)' TARGET=$(TARGET) bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= install install-static endef
--- a/src/libgomp.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libgomp.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ --target='$(TARGET)' \ - --prefix='$(PREFIX)' \ + --prefix='$(BUILD_TOOLS_PREFIX)' \ --enable-version-specific-runtime-libs \ --with-gnu-ld \ $(ENABLE_SHARED_OR_STATIC) \ @@ -29,6 +29,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libgomp.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-libgomp.exe' \ -fopenmp endef
--- a/src/libgpg_error.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libgpg_error.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,10 +21,10 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-nls \ --disable-languages $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(LN_SF) '$(PREFIX)/$(TARGET)/bin/gpg-error-config' '$(PREFIX)/bin/$(TARGET)-gpg-error-config' + $(LN_SF) '$(HOST_PREFIX)/bin/gpg-error-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gpg-error-config' endef
--- a/src/libgsasl.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libgsasl.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,16 +21,16 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-nls \ --with-libgcrypt \ - --with-libiconv-prefix='$(PREFIX)/$(TARGET)' \ - --with-libidn-prefix='$(PREFIX)/$(TARGET)' \ - --with-libntlm-prefix='$(PREFIX)/$(TARGET)' + --with-libiconv-prefix='$(HOST_PREFIX)' \ + --with-libidn-prefix='$(HOST_PREFIX)' \ + --with-libntlm-prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libgsasl.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-libgsasl.exe' \ `'$(TARGET)-pkg-config' libgsasl --cflags --libs` endef
--- a/src/libgsf.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libgsf.mk Sun Jun 02 10:31:04 2013 -0400 @@ -24,14 +24,14 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-nls \ --disable-gtk-doc \ --without-python \ --with-zlib \ --with-bz2 \ --with-gio \ - PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' + PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install-pkgconfigDATA $(MAKE) -C '$(1)/gsf' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libharu.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libharu.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,9 +19,9 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ - --with-zlib='$(PREFIX)/$(TARGET)' \ - --with-png='$(PREFIX)/$(TARGET)' + --with-zlib='$(HOST_PREFIX)' \ + --with-png='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/libiberty.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libiberty.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,13 +18,13 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-install-libiberty $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install target_header_dir=libiberty '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libiberty.exe' \ - -I$(PREFIX)/$(TARGET)/include/libiberty -liberty + '$(2).c' -o '$(HOST_PREFIX)/bin/test-libiberty.exe' \ + -I$(HOST_PREFIX)/include/libiberty -liberty endef
--- a/src/libical.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libical.mk Sun Jun 02 10:31:04 2013 -0400 @@ -27,6 +27,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libical.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-libical.exe' \ `'$(TARGET)-pkg-config' libical --cflags --libs` endef
--- a/src/libiconv.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libiconv.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,12 +20,12 @@ $(SED) -i 's, sed , $(SED) ,g' '$(1)/windows/windres-options' cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ CPPFLAGS='$(MXE_CPPFLAGS)' \ --disable-nls $(MAKE) -C '$(1)/libcharset' -j '$(JOBS)' install $(MAKE) -C '$(1)/lib' -j '$(JOBS)' install - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/include/iconv.h.inst' '$(PREFIX)/$(TARGET)/include/iconv.h' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -m644 '$(1)/include/iconv.h.inst' '$(HOST_PREFIX)/include/iconv.h' endef
--- a/src/libidn.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libidn.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,7 +23,7 @@ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ --disable-csharp \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-libiconv-prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' \ + --with-libiconv-prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libircclient.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libircclient.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,23 +18,23 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ --disable-debug \ --enable-threads \ --disable-ipv6 $(MAKE) -C '$(1)'/src -j '$(JOBS)' static - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/src/libircclient.a' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/libircclient' - $(INSTALL) -m644 '$(1)/include/libircclient.h' '$(PREFIX)/$(TARGET)/include/libircclient' - $(INSTALL) -m644 '$(1)/include/libirc_errors.h' '$(PREFIX)/$(TARGET)/include/libircclient' - $(INSTALL) -m644 '$(1)/include/libirc_events.h' '$(PREFIX)/$(TARGET)/include/libircclient' - $(INSTALL) -m644 '$(1)/include/libirc_rfcnumeric.h' '$(PREFIX)/$(TARGET)/include/libircclient' - $(INSTALL) -m644 '$(1)/include/libirc_options.h' '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -d '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)/src/libircclient.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -d '$(HOST_PREFIX)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libircclient.h' '$(HOST_PREFIX)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_errors.h' '$(HOST_PREFIX)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_events.h' '$(HOST_PREFIX)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_rfcnumeric.h' '$(HOST_PREFIX)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_options.h' '$(HOST_PREFIX)/include/libircclient' '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-libircclient.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-libircclient.exe' \ -lircclient -lws2_32 endef
--- a/src/liblo.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/liblo.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libmad.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libmad.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,6 +20,6 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/libmikmod.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libmikmod.mk Sun Jun 02 10:31:04 2013 -0400 @@ -25,13 +25,13 @@ STRIP='$(TARGET)-strip' \ ./configure \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ + --prefix='$(HOST_PREFIX)' \ + --libdir='$(HOST_PREFIX)/lib' \ --disable-esd $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ -W -Wall -Werror -std=c99 -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libmikmod.exe' \ - `'$(PREFIX)/$(TARGET)/bin/libmikmod-config' --cflags --libs` + '$(2).c' -o '$(HOST_PREFIX)/bin/test-libmikmod.exe' \ + `'$(HOST_PREFIX)/bin/libmikmod-config' --cflags --libs` endef
--- a/src/libmng.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libmng.mk Sun Jun 02 10:31:04 2013 -0400 @@ -24,13 +24,13 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-shared $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install - $(SED) -e 's^@prefix@^$(PREFIX)/$(TARGET)^;' \ + $(SED) -e 's^@prefix@^$(HOST_PREFIX)^;' \ -e 's^@VERSION@^$(libmng_VERSION)^;' \ -e 's^@mng_libs_private@^-ljpeg^;' \ -e 's^@mng_requires_private@^lcms zlib^;' \ < '$(1)/libmng.pc.in' > '$(1)/libmng.pc' - $(INSTALL) -m644 '$(1)/libmng.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/' + $(INSTALL) -m644 '$(1)/libmng.pc' '$(HOST_PREFIX)/lib/pkgconfig/' endef
--- a/src/libmodplug.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libmodplug.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,11 +20,11 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install '$(TARGET)-gcc' \ -W -Wall -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libmodplug.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-libmodplug.exe' \ `'$(TARGET)-pkg-config' libmodplug --cflags --libs` endef
--- a/src/libntlm.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libntlm.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,6 +21,6 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/liboauth.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/liboauth.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-curl $(MAKE) -C '$(1)' -j '$(JOBS)' @@ -26,6 +26,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-liboauth.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-liboauth.exe' \ `'$(TARGET)-pkg-config' oauth --cflags --libs` endef
--- a/src/libodbc++.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libodbc++.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && autoreconf --install cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ --without-tests \
--- a/src/liboil.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/liboil.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ --disable-examples \
--- a/src/libpano13.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libpano13.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,13 +23,13 @@ $(SED) -i 's,\(@HAVE_MINGW_TRUE@WIN_SRC = .*\),\1 ppm.c,' '$(1)/Makefile.in' $(SED) -i 's,mv.*libpano13\.dll.*,,' '$(1)/Makefile.in' cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --with-jpeg='$(PREFIX)/$(TARGET)'/lib \ - --with-tiff='$(PREFIX)/$(TARGET)'/lib \ - --with-png='$(PREFIX)/$(TARGET)'/lib \ - --with-zlib='$(PREFIX)/$(TARGET)'/lib \ + --with-jpeg='$(HOST_PREFIX)'/lib \ + --with-tiff='$(HOST_PREFIX)'/lib \ + --with-png='$(HOST_PREFIX)'/lib \ + --with-zlib='$(HOST_PREFIX)'/lib \ LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= endef
--- a/src/libpaper.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libpaper.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,6 +21,6 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libpng.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libpng.mk Sun Jun 02 10:31:04 2013 -0400 @@ -27,7 +27,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= rm -f $(MXE_LIBDIR)/libpng.la
--- a/src/librsvg.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/librsvg.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-pixbuf-loader \ --disable-gtk-theme \ --disable-gtk-doc \ @@ -29,6 +29,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-librsvg.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-librsvg.exe' \ `'$(TARGET)-pkg-config' librsvg-2.0 --cflags --libs` endef
--- a/src/librtmp.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/librtmp.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' \ CROSS_COMPILE='$(TARGET)-' \ - prefix='$(PREFIX)/$(TARGET)' \ + prefix='$(HOST_PREFIX)' \ SYS=mingw \ CRYPTO=GNUTLS \ SHARED=no \
--- a/src/libsamplerate.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libsamplerate.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libshout.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libshout.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-thread \ --infodir='$(1)/sink' \
--- a/src/libsigc++.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libsigc++.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,9 +21,9 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ CXX='$(TARGET)-c++' \ - PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ + PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/libsndfile.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libsndfile.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-sqlite \ --enable-external-libs \ --disable-octave \
--- a/src/libssh2.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libssh2.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --without-openssl \ --with-libgcrypt \ PKG_CONFIG='$(TARGET)-pkg-config' @@ -30,7 +30,7 @@ ## '$(TARGET)-gcc' \ ## -W -Wall -Werror -ansi -pedantic \ -## '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libssh2.exe' \ +## '$(2).c' -o '$(HOST_PREFIX)/bin/test-libssh2.exe' \ ## `'$(TARGET)-pkg-config' --cflags --libs libssh2` endef
--- a/src/libtool.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libtool.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)/libltdl' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --enable-ltdl-install $(MAKE) -C '$(1)/libltdl' -j '$(JOBS)'
--- a/src/libunistring.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libunistring.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --enable-threads=win32 $(MAKE) -C '$(1)' -j '$(JOBS)'
--- a/src/libusb.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libusb.mk Sun Jun 02 10:31:04 2013 -0400 @@ -29,9 +29,9 @@ --def libusb0.def \ --output-lib libusb.a - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/src/lusb0_usb.h' '$(PREFIX)/$(TARGET)/include/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/libusb.a' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -m644 '$(1)/libusbd.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -m644 '$(1)/src/lusb0_usb.h' '$(HOST_PREFIX)/include/' + $(INSTALL) -d '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)/libusb.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -m644 '$(1)/libusbd.a' '$(HOST_PREFIX)/lib/' endef
--- a/src/libvpx.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libvpx.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,11 +19,11 @@ cd '$(1)' && \ CROSS='$(TARGET)-' \ ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --target=x86-win32-gcc \ --disable-examples \ --disable-install-docs $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - $(TARGET)-ranlib $(PREFIX)/$(TARGET)/lib/libvpx.a + $(TARGET)-ranlib $(HOST_PREFIX)/lib/libvpx.a endef
--- a/src/libxml++.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libxml++.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libxml2.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libxml2.mk Sun Jun 02 10:31:04 2013 -0400 @@ -24,7 +24,7 @@ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ --without-debug \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --without-python \ --without-threads $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/libxslt.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libxslt.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,9 +21,9 @@ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ --without-debug \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-libxml-prefix='$(PREFIX)/$(TARGET)' \ - LIBGCRYPT_CONFIG='$(PREFIX)/$(TARGET)/bin/libgcrypt-config' \ + --prefix='$(HOST_PREFIX)' \ + --with-libxml-prefix='$(HOST_PREFIX)' \ + LIBGCRYPT_CONFIG='$(HOST_PREFIX)/bin/libgcrypt-config' \ --without-python \ --without-plugins $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/llvm.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/llvm.mk Sun Jun 02 10:31:04 2013 -0400 @@ -26,5 +26,5 @@ $(MAKE) -C '$(1)/build' -j $(JOBS) llvm-tblgen $(MAKE) -C '$(1)/build' -j $(JOBS) intrinsics_gen $(MAKE) -C '$(1)/build' -j $(JOBS) install - $(LN_SF) '$(PREFIX)/$(TARGET)/bin/llvm-config' '$(PREFIX)/bin/$(TARGET)-llvm-config' + $(LN_SF) '$(HOST_PREFIX)/bin/llvm-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-llvm-config' endef
--- a/src/log4cxx.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/log4cxx.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,19 +18,19 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --with-apr='$(PREFIX)/$(TARGET)' \ - --with-apr-util='$(PREFIX)/$(TARGET)' \ + --with-apr='$(HOST_PREFIX)' \ + --with-apr-util='$(HOST_PREFIX)' \ CFLAGS=-D_WIN32_WINNT=0x0500 \ CXXFLAGS=-D_WIN32_WINNT=0x0500 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= - mkdir -p '$(PREFIX)/$(TARGET)/share/cmake/log4cxx' - cp '$(1)/log4cxx-config.cmake' '$(PREFIX)/$(TARGET)/share/cmake/log4cxx/log4cxx-config.cmake' + mkdir -p '$(HOST_PREFIX)/share/cmake/log4cxx' + cp '$(1)/log4cxx-config.cmake' '$(HOST_PREFIX)/share/cmake/log4cxx/log4cxx-config.cmake' '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-log4cxx.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-log4cxx.exe' \ `$(TARGET)-pkg-config liblog4cxx --libs` endef
--- a/src/lua.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/lua.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,13 +17,13 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)/src' -j '$(JOBS)' \ - INSTALL_TOP='$(PREFIX)/$(TARGET)' \ + INSTALL_TOP='$(HOST_PREFIX)' \ CC='$(TARGET)-gcc' \ AR='$(TARGET)-ar rcu' \ RANLIB='$(TARGET)-ranlib' \ a $(MAKE) -C '$(1)' -j 1 \ - INSTALL_TOP='$(PREFIX)/$(TARGET)' \ + INSTALL_TOP='$(HOST_PREFIX)' \ INSTALL_BIN='$(1)/noinstall' \ INSTALL_MAN='$(1)/noinstall' \ TO_BIN='lua.h' \ @@ -32,6 +32,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-lua.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-lua.exe' \ -llua endef
--- a/src/lzo.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/lzo.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,6 +21,6 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/matio.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/matio.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-test \ --disable-docs
--- a/src/mdbtools.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/mdbtools.mk Sun Jun 02 10:31:04 2013 -0400 @@ -24,7 +24,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ - PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' + --prefix='$(HOST_PREFIX)' \ + PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= endef
--- a/src/mingw-utils.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/mingw-utils.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,15 +20,15 @@ cp -Rp '$(1)' '$(1).native' cd '$(1).native' && ./configure \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)' + --prefix='$(BUILD_TOOLS_PREFIX)' $(MAKE) -C '$(1).native/reimp' -j '$(JOBS)' - $(INSTALL) -m755 '$(1).native/reimp/reimp' '$(PREFIX)/bin/$(TARGET)-reimp' + $(INSTALL) -m755 '$(1).native/reimp/reimp' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-reimp' # cross build cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef
--- a/src/mingwrt.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/mingwrt.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,7 +16,7 @@ endef define $(PKG)_BUILD - $(INSTALL) -d '$(PREFIX)/$(TARGET)' + $(INSTALL) -d '$(HOST_PREFIX)' cd '$(1)' && \ - cp -rpv include lib '$(PREFIX)/$(TARGET)' + cp -rpv include lib '$(HOST_PREFIX)' endef
--- a/src/mpfr.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/mpfr.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,10 +21,10 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-threads=win32 \ - --with-gmp-include='$(PREFIX)/$(TARGET)/include/' - --with-gmp-lib='$(PREFIX)/$(TARGET)/lib/' + --with-gmp-include='$(HOST_PREFIX)/include/' + --with-gmp-lib='$(HOST_PREFIX)/lib/' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/msys-bash.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-bash.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-coreutils.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-coreutils.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-diffutils.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-diffutils.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-file.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-file.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-findutils.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-findutils.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-gawk.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-gawk.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-grep.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-grep.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-gzip.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-gzip.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-less.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-less.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-libiconv.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-libiconv.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-libintl.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-libintl.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-libmagic.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-libmagic.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-make.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-make.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-msys-core.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-msys-core.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-regex.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-regex.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-sed.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-sed.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-tar.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-tar.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-termcap.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-termcap.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-texinfo.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-texinfo.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/msys-xz.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/msys-xz.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,6 +18,6 @@ define $(PKG)_BUILD mkdir -p '$(MSYS_BASE_DIR)' cd '$(1)' && tar cf - . | ( cd '$(MSYS_BASE_DIR)'; tar xpf - ) - mkdir -p '$(PREFIX)'/../msys-info - cd '$(1)' && find . > '$(PREFIX)'/../msys-info/$(PKG).list + mkdir -p '$(MSYS_INFO_DIR)' + cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list endef
--- a/src/muparser.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/muparser.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-samples \ --disable-debug
--- a/src/mxml.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/mxml.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,17 +19,17 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-threads $(MAKE) -C '$(1)' -j '$(JOBS)' libmxml.a $(MAKE) -C '$(1)' -j 1 install-libmxml.a - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/mxml.h' '$(PREFIX)/$(TARGET)/include/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' - $(INSTALL) -m644 '$(1)/mxml.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -m644 '$(1)/mxml.h' '$(HOST_PREFIX)/include/' + $(INSTALL) -d '$(HOST_PREFIX)/lib/pkgconfig' + $(INSTALL) -m644 '$(1)/mxml.pc' '$(HOST_PREFIX)/lib/pkgconfig/' '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-mxml.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-mxml.exe' \ `'$(TARGET)-pkg-config' mxml --cflags --libs` endef
--- a/src/native-binutils.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/native-binutils.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,12 +19,12 @@ define $(PKG)_BUILD # install config.guess for general use - $(INSTALL) -d '$(PREFIX)/../dist/usr/bin' - $(INSTALL) -m755 '$(1)/config.guess' '$(PREFIX)/../dist/usr/bin/' + $(INSTALL) -d '$(TOP_DIR)/dist/usr/bin' + $(INSTALL) -m755 '$(1)/config.guess' '$(TOP_DIR)/dist/usr/bin/' # install target-specific autotools config file - $(INSTALL) -d '$(PREFIX)/../dist/usr/share' - echo "ac_cv_build=`$(1)/config.guess`" > '$(PREFIX)/../dist/usr/share/config.site' + $(INSTALL) -d '$(TOP_DIR)/dist/usr/share' + echo "ac_cv_build=`$(1)/config.guess`" > '$(TOP_DIR)/dist/usr/share/config.site' cd '$(1)' && ./configure \ --target='$(TARGET)' \ @@ -38,5 +38,5 @@ $(ENABLE_SHARED_OR_STATIC) \ --disable-werror $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 DESTDIR='$(PREFIX)/../native-tools' install + $(MAKE) -C '$(1)' -j 1 DESTDIR='$(TOP_DIR)/native-tools' install endef
--- a/src/native-gcc.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/native-gcc.mk Sun Jun 02 10:31:04 2013 -0400 @@ -55,13 +55,13 @@ --with-native-system-header-dir=$(MXE_INCDIR) \ $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'") $(MAKE) -C '$(1).build' -j '$(JOBS)' - $(MAKE) -C '$(1).build' -j 1 DESTDIR='$(PREFIX)/../native-tools' install + $(MAKE) -C '$(1).build' -j 1 DESTDIR='$(TOP_DIR)/native-tools' install # # create pkg-config script # (echo '#!/bin/sh'; \ # echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(MXE_LIBDIR)/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG) "$$@"') \ - # > '$(PREFIX)/bin/$(TARGET)-pkg-config' - # chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config' + # > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' + # chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' # # create the CMake toolchain file # [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' @@ -78,17 +78,17 @@ # echo 'set(BUILD_STATIC_LIBS OFF)'; \ # fi; \ # echo 'set(CMAKE_BUILD_TYPE Release)'; \ - # echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \ + # echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX))'; \ # echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ # echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ # echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)'; \ - # echo 'set(CMAKE_C_COMPILER $(PREFIX)/bin/$(TARGET)-gcc)'; \ - # echo 'set(CMAKE_CXX_COMPILER $(PREFIX)/bin/$(TARGET)-g++)'; \ - # echo 'set(CMAKE_Fortran_COMPILER $(PREFIX)/bin/$(TARGET)-gfortran)'; \ - # echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \ - # echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ - # echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/bin/$(TARGET)-qmake)'; \ - # echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ + # echo 'set(CMAKE_C_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gcc)'; \ + # echo 'set(CMAKE_CXX_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-g++)'; \ + # echo 'set(CMAKE_Fortran_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gfortran)'; \ + # echo 'set(CMAKE_RC_COMPILER $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-windres)'; \ + # echo 'set(PKG_CONFIG_EXECUTABLE $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config)'; \ + # echo 'set(QT_QMAKE_EXECUTABLE $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake)'; \ + # echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX) CACHE PATH "Installation Prefix")'; \ # echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ # > '$(CMAKE_TOOLCHAIN_FILE)' endef
--- a/src/ncurses.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/ncurses.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix=$(PREFIX)/$(TARGET) \ + --prefix=$(HOST_PREFIX) \ --disable-home-terminfo \ --enable-sp-funcs \ --enable-term-driver \
--- a/src/nettle.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/nettle.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,15 +22,15 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - if [ -d $(PREFIX)/$(TARGET)/lib64 ]; then \ + if [ -d $(HOST_PREFIX)/lib64 ]; then \ $(INSTALL) -d $(MXE_LIBDIR)/pkgconfig; \ - mv $(PREFIX)/$(TARGET)/lib64/pkgconfig/* $(MXE_LIBDIR)/pkgconfig; \ - rmdir $(PREFIX)/$(TARGET)/lib64/pkgconfig; \ - mv $(PREFIX)/$(TARGET)/lib64/* $(MXE_LIBDIR); \ + mv $(HOST_PREFIX)/lib64/pkgconfig/* $(MXE_LIBDIR)/pkgconfig; \ + rmdir $(HOST_PREFIX)/lib64/pkgconfig; \ + mv $(HOST_PREFIX)/lib64/* $(MXE_LIBDIR); \ fi endef
--- a/src/nsis.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/nsis.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,10 +19,10 @@ define $(PKG)_BUILD cd '$(1)' && scons VERBOSE=1 \ MINGW_CROSS_PREFIX='$(TARGET)-' \ - PREFIX='$(PREFIX)/$(TARGET)' \ + PREFIX='$(HOST_PREFIX)' \ `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \ `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \ SKIPUTILS='NSIS Menu' \ install - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/makensis' '$(PREFIX)/bin/$(TARGET)-makensis' + $(INSTALL) -m755 '$(HOST_PREFIX)/bin/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-makensis' endef
--- a/src/ocaml-core.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/ocaml-core.mk Sun Jun 02 10:31:04 2013 -0400 @@ -26,9 +26,9 @@ # reduction optimizations using its internal int type, and that must # match Windows' int type. (That's what -cc and -host are for). cd '$(1)' && ./configure \ - -prefix '$(PREFIX)/$(TARGET)' \ - -bindir '$(PREFIX)/$(TARGET)/bin' \ - -libdir '$(PREFIX)/$(TARGET)/lib/ocaml' \ + -prefix '$(HOST_PREFIX)' \ + -bindir '$(HOST_PREFIX)/bin' \ + -libdir '$(HOST_PREFIX)/lib/ocaml' \ -no-tk \ -cc "gcc -m32" \ -no-shared-libs \ @@ -45,14 +45,14 @@ $(MAKE) -C '$(1)' all # install ocamldoc and camlp4 (non cross versions) $(MAKE) -C '$(1)/ocamldoc' install - cd '$(1)' && BINDIR=$(PREFIX)/$(TARGET)/bin \ - LIBDIR=$(PREFIX)/$(TARGET)/lib/ocaml \ - PREFIX=$(PREFIX)/$(TARGET) \ + cd '$(1)' && BINDIR=$(HOST_PREFIX)/bin \ + LIBDIR=$(HOST_PREFIX)/lib/ocaml \ + PREFIX=$(HOST_PREFIX) \ ./build/partial-install.sh ####### patch mingw include # Now patch utils/clflags.ml to hardcode mingw-specific include. - $(SED) -i "s,@libdir@,$(PREFIX)/$(TARGET)/lib,g" \ + $(SED) -i "s,@libdir@,$(HOST_PREFIX)/lib,g" \ $(1)/hardcode_mingw_include.patch cd '$(1)' && patch -p2 < hardcode_mingw_include.patch @@ -64,18 +64,18 @@ # config/Makefile is a custom one which we supply. rm -f $(1)/config/Makefile $(SED) \ - -e "s,@prefix@,$(PREFIX)/$(TARGET),g" \ + -e "s,@prefix@,$(HOST_PREFIX),g" \ -e "s,@toolpref@,$(TARGET),g" \ -e "s,@otherlibraries@,$(OTHER_LIBS),g" \ < $(1)/Makefile-mingw.in > $(1)/config/Makefile - $(SED) -i "s,@libdir@,$(PREFIX)/$(TARGET)/lib,g" $(1)/otherlibs/Makefile.shared + $(SED) -i "s,@libdir@,$(HOST_PREFIX)/lib,g" $(1)/otherlibs/Makefile.shared # We're going to build in otherlibs/win32unix and otherlibs/win32graph # directories, but since they would normally only be built under # Windows, they only have the Makefile.nt files. Just symlink # Makefile -> Makefile.nt for these cases. - $(SED) -i "s,@libdir@,$(PREFIX)/$(TARGET)/lib,g" $(1)/otherlibs/win32unix/Makefile.nt - $(SED) -i "s,@libdir@,$(PREFIX)/$(TARGET)/lib,g" $(1)/otherlibs/win32graph/Makefile.nt - $(SED) -i "s,@libdir@,$(PREFIX)/$(TARGET)/lib,g" $(1)/otherlibs/systhreads/Makefile.nt + $(SED) -i "s,@libdir@,$(HOST_PREFIX)/lib,g" $(1)/otherlibs/win32unix/Makefile.nt + $(SED) -i "s,@libdir@,$(HOST_PREFIX)/lib,g" $(1)/otherlibs/win32graph/Makefile.nt + $(SED) -i "s,@libdir@,$(HOST_PREFIX)/lib,g" $(1)/otherlibs/systhreads/Makefile.nt for d in $(1)/otherlibs/win32unix \ $(1)/otherlibs/win32graph \ $(1)/otherlibs/bigarray \ @@ -113,7 +113,7 @@ $(MAKE) -C '$(1)' installopt # Rename all the binaries to target-binary for f in ocamlc ocamlcp ocamlrun ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof camlp4prof camlp4boot camlp4 camlp4oof camlp4of camlp4o camlp4rf camlp4r camlp4orf ocamldoc ; do \ - cp -f $(PREFIX)/$(TARGET)/bin/$$f $(PREFIX)/bin/$(TARGET)-$$f; \ + cp -f $(HOST_PREFIX)/bin/$$f $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-$$f; \ done # test ocamlopt
--- a/src/ocaml-flexdll.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/ocaml-flexdll.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,21 +20,21 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' \ CHAINS=mingw \ MINGW_PREFIX=$(TARGET) \ - OCAMLOPT=$(PREFIX)/$(TARGET)/bin/ocaml-native/ocamlopt \ + OCAMLOPT=$(HOST_PREFIX)/bin/ocaml-native/ocamlopt \ all - mkdir -p '$(PREFIX)/$(TARGET)/lib/ocaml/flexdll' + mkdir -p '$(HOST_PREFIX)/lib/ocaml/flexdll' cd '$(1)' && mv flexlink.exe flexlink cd '$(1)' && strip --remove-section=.comment --remove-section=.note flexlink - cd '$(1)' && $(INSTALL) -m 0755 flexdll.h '$(PREFIX)/$(TARGET)/include' + cd '$(1)' && $(INSTALL) -m 0755 flexdll.h '$(HOST_PREFIX)/include' cd '$(1)' && $(INSTALL) -m 0755 flexlink flexdll_mingw.o \ flexdll_initer_mingw.o \ - '$(PREFIX)/$(TARGET)/lib/ocaml/flexdll' + '$(HOST_PREFIX)/lib/ocaml/flexdll' # create flexdll scripts - cd '$(PREFIX)/bin' && $(LN_SF) '$(PREFIX)/$(TARGET)/lib/ocaml/flexdll/flexlink' + cd '$(BUILD_TOOLS_PREFIX)/bin' && $(LN_SF) '$(HOST_PREFIX)/lib/ocaml/flexdll/flexlink' (echo '#!/bin/sh'; \ - echo 'exec flexlink -I $(PREFIX)/$(TARGET)/lib -chain mingw -nocygpath "$$@"') \ - > '$(PREFIX)/bin/$(TARGET)-flexlink' - chmod 0755 '$(PREFIX)/bin/$(TARGET)-flexlink' + echo 'exec flexlink -I $(HOST_PREFIX)/lib -chain mingw -nocygpath "$$@"') \ + > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-flexlink' + chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-flexlink' echo "testing flexlink..." $(MAKE) -C '$(1)/test' -j '$(JOBS)' dump.exe plug1.dll plug2.dll CC=$(TARGET)-gcc O=o FLEXLINK=$(TARGET)-flexlink
--- a/src/ocaml-native.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/ocaml-native.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,9 +19,9 @@ define $(PKG)_BUILD # patched ocaml source to get ocamlbuild use $(TARGET)-ocamlc, $(TARGET)-ocamlfind, ... cd '$(1)' && ./configure \ - -prefix '$(PREFIX)/$(TARGET)' \ - -bindir '$(PREFIX)/$(TARGET)/bin/ocaml-native' \ - -libdir '$(PREFIX)/$(TARGET)/lib/ocaml-native' \ + -prefix '$(HOST_PREFIX)' \ + -bindir '$(HOST_PREFIX)/bin/ocaml-native' \ + -libdir '$(HOST_PREFIX)/lib/ocaml-native' \ -no-tk \ -no-shared-libs \ -verbose @@ -29,12 +29,12 @@ $(SED) -i "s,@target@,$(TARGET),g" $(1)/ocamlbuild/options.ml $(SED) -i "s,@target@,$(TARGET),g" $(1)/ocamlbuild/findlib.ml $(MAKE) -C '$(1)' -j '$(JOBS)' ocamlbuild.native - cp -f '$(1)/_build/ocamlbuild/ocamlbuild.native' $(PREFIX)/bin/$(TARGET)-ocamlbuild + cp -f '$(1)/_build/ocamlbuild/ocamlbuild.native' $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ocamlbuild $(MAKE) -C '$(1)' install # the following script requires ocamlbuild with option -ocamlfind to work #(echo '#!/bin/sh'; \ - # echo 'exec $(PREFIX)/bin/ocamlbuild -use-ocamlfind -ocamlfind $(TARGET)-ocamlfind "$$@"') \ - # > '$(PREFIX)/bin/$(TARGET)-ocamlbuild' - #chmod 0755 '$(PREFIX)/bin/$(TARGET)-ocamlbuild' + # echo 'exec $(BUILD_TOOLS_PREFIX)/bin/ocamlbuild -use-ocamlfind -ocamlfind $(TARGET)-ocamlfind "$$@"') \ + # > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ocamlbuild' + #chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ocamlbuild' # test will be done once cross ocamlopt is built endef
--- a/src/octave.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/octave.mk Sun Jun 02 10:31:04 2013 -0400 @@ -14,7 +14,7 @@ else ifeq ($(MXE_SYSTEM),mingw) $(PKG)_CROSS_CONFIG_OPTIONS := \ - FLTK_CONFIG='$(PREFIX)/bin/$(TARGET)-fltk-config' \ + FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-fltk-config' \ gl_cv_func_gettimeofday_clobber=no endif endif @@ -32,13 +32,13 @@ LDFLAGS='-Wl,-rpath-link,$(MXE_LIBDIR) -L$(MXE_LIBDIR)' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $($(PKG)_CROSS_CONFIG_OPTIONS) ## We want both of these install steps so that we install in the ## location set by the configure --prefix option, and the other ## in a directory tree that will have just Octave files. $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(PREFIX)/../octave install + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_DIR)/octave install endef
--- a/src/of-communications.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-communications.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,8 +17,8 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' cd '$(1)/..' \ && tar czf $($(PKG)_FIXED_FILE) $($(PKG)_SUBDIR) \ - && $(INSTALL) -m644 '$($(PKG)_FIXED_FILE)' '$(PREFIX)/$(TARGET)/src' + && $(INSTALL) -m644 '$($(PKG)_FIXED_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/of-control.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-control.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,6 +16,6 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' - $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/of-general.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-general.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,6 +16,6 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' - $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/of-image.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-image.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,6 +16,6 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' - $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/of-io.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-io.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,6 +16,6 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' - $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/of-miscellaneous.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-miscellaneous.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,6 +16,6 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' - $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/of-optim.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-optim.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,8 +17,8 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' cd '$(1)/..' \ && tar czf $($(PKG)_FIXED_FILE) $($(PKG)_SUBDIR) \ - && $(INSTALL) -m644 '$($(PKG)_FIXED_FILE)' '$(PREFIX)/$(TARGET)/src' + && $(INSTALL) -m644 '$($(PKG)_FIXED_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/of-signal.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-signal.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,6 +16,6 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' - $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/of-specfun.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-specfun.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,6 +16,6 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' - $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/of-statistics.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-statistics.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,6 +16,6 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' - $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/of-struct.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-struct.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,6 +16,6 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' - $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/of-windows.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/of-windows.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,6 +16,6 @@ endef define $(PKG)_BUILD - mkdir -p '$(PREFIX)/$(TARGET)/src' - $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(PREFIX)/$(TARGET)/src' + mkdir -p '$(HOST_PREFIX)/src' + $(INSTALL) -m644 '$(PKG_DIR)/$($(PKG)_FILE)' '$(HOST_PREFIX)/src' endef
--- a/src/ogg.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/ogg.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/old.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/old.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,8 +20,8 @@ cd '$(1)' && $(TARGET)-gcc -O3 -Iinclude -c -o libold.o lib/libold.c cd '$(1)' && $(TARGET)-ar cr libold.a libold.o $(TARGET)-ranlib '$(1)/libold.a' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/libold.a' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/lib/old.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -d '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)/libold.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -m644 '$(1)/lib/old.h' '$(HOST_PREFIX)/include/' endef
--- a/src/openal.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/openal.mk Sun Jun 02 10:31:04 2013 -0400 @@ -24,6 +24,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-openal.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-openal.exe' \ `'$(TARGET)-pkg-config' openal --cflags --libs` endef
--- a/src/opencore-amr.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/opencore-amr.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install
--- a/src/opencsg.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/opencsg.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,10 +19,10 @@ define $(PKG)_BUILD cd '$(1)/src' && '$(TARGET)-qmake' src.pro $(MAKE) -C '$(1)/src' -j '$(JOBS)' - $(INSTALL) -m644 '$(1)/include/opencsg.h' '$(PREFIX)/$(TARGET)/include/' - $(INSTALL) -m644 '$(1)/lib/libopencsg.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -m644 '$(1)/include/opencsg.h' '$(HOST_PREFIX)/include/' + $(INSTALL) -m644 '$(1)/lib/libopencsg.a' '$(HOST_PREFIX)/lib/' cd '$(1)/example' && '$(TARGET)-qmake' example.pro $(MAKE) -C '$(1)/example' -j '$(JOBS)' - $(INSTALL) -m755 '$(1)/example/release/opencsgexample.exe' '$(PREFIX)/$(TARGET)/bin/test-opencsg.exe' + $(INSTALL) -m755 '$(1)/example/release/opencsgexample.exe' '$(HOST_PREFIX)/bin/test-opencsg.exe' endef
--- a/src/openexr.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/openexr.mk Sun Jun 02 10:31:04 2013 -0400 @@ -35,11 +35,11 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-threading \ --disable-posix-sem \ --disable-ilmbasetest \ - PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' + PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' # build the code generator manually cd '$(1)/IlmImf' && g++ \ -I'$(1)/ilmbase/include/OpenEXR' \
--- a/src/openssl.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/openssl.mk Sun Jun 02 10:31:04 2013 -0400 @@ -30,7 +30,7 @@ zlib \ shared \ no-capieng \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --libdir=lib $(MAKE) -C '$(1)' install -j 1 \ CC='$(MXE_CC) -I$(MXE_INCDIR) -L$(MXE_LIBDIR)' \
--- a/src/pango.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/pango.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,7 +23,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-gtk-doc \ --without-x \ --enable-explicit-deps \
--- a/src/pangomm.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/pangomm.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ MAKE=$(MAKE) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/pcre.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/pcre.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,7 +23,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-pcre16 \ --enable-utf \ --enable-unicode-properties \ @@ -31,7 +31,7 @@ --disable-pcregrep-libz \ --disable-pcregrep-libbz2 \ --disable-pcretest-libreadline - rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/pcre16*.3 + rm -f '$(HOST_PREFIX)'/share/man/man3/pcre16*.3 $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(INSTALL) -m755 $(PREFIX)/$(TARGET)/bin/pcre-config $(PREFIX)/bin/pcre-config + $(INSTALL) -m755 $(HOST_PREFIX)/bin/pcre-config $(BUILD_TOOLS_PREFIX)/bin/pcre-config endef
--- a/src/pdcurses.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/pdcurses.mk Sun Jun 02 10:31:04 2013 -0400 @@ -34,6 +34,6 @@ $(INSTALL) -m644 '$(1)/libcurses.a' '$(MXE_LIBDIR)/libcurses.a' $(INSTALL) -m644 '$(1)/panel.a' '$(MXE_LIBDIR)/libpanel.a' fi - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -d '$(HOST_PREFIX)/include/' $(INSTALL) -m644 '$(1)/curses.h' '$(1)/panel.h' '$(1)/term.h' '$(MXE_INCDIR)' endef
--- a/src/pdflib_lite.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/pdflib_lite.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --without-openssl \ --without-java \ --without-py \
--- a/src/pfstools.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/pfstools.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-netpbm \ --disable-openexr \
--- a/src/physfs.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/physfs.mk Sun Jun 02 10:31:04 2013 -0400 @@ -26,6 +26,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic -std=c99 \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-physfs.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-physfs.exe' \ -lphysfs -lz endef
--- a/src/pixman.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/pixman.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,6 +21,6 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/plibc.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/plibc.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/plotmm.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/plotmm.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) $(MAKE) -C '$(1)' -j '$(JOBS)' install \ bin_PROGRAMS= \
--- a/src/plotutils.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/plotutils.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ --enable-libplotter \
--- a/src/poco.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/poco.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,11 +19,11 @@ cd '$(1)' && ./configure \ --config=MinGW-CrossEnv \ --static \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install CROSSENV=$(TARGET) '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-poco.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-poco.exe' \ -lPocoFoundation endef
--- a/src/poppler.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/poppler.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,7 +23,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-silent-rules \ $(ENABLE_SHARED_OR_STATIC) \ --enable-xpdf-headers \ @@ -46,14 +46,14 @@ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ --with-font-configuration=win32 \ - PKG_CONFIG_PATH_$(subst -,_,$(TARGET))='$(PREFIX)/$(TARGET)/qt/lib/pkgconfig' \ + PKG_CONFIG_PATH_$(subst -,_,$(TARGET))='$(HOST_PREFIX)/qt/lib/pkgconfig' \ LIBS="`'$(TARGET)-pkg-config' zlib liblzma --libs` -ljpeg" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= # Test program '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \ + '$(2).cxx' -o '$(HOST_PREFIX)/bin/test-poppler.exe' \ `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs` endef
--- a/src/popt.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/popt.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-nls $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/portaudio.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/portaudio.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,16 +20,16 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --with-host_os=mingw \ --with-winapi=wmme,directx,wasapi,wdmks \ - --with-dxdir=$(PREFIX)/$(TARGET) \ + --with-dxdir=$(HOST_PREFIX) \ ac_cv_path_AR=$(TARGET)-ar $(MAKE) -C '$(1)' -j '$(JOBS)' SHARED_FLAGS= TESTS= $(MAKE) -C '$(1)' -j 1 install '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-portaudio.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-portaudio.exe' \ `'$(TARGET)-pkg-config' portaudio-2.0 --cflags --libs` endef
--- a/src/postgresql.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/postgresql.mk Sun Jun 02 10:31:04 2013 -0400 @@ -32,7 +32,7 @@ # Since we build only client libary, use bogus tzdata to satisfy configure. cd '$(1)' && ./configure \ $($(PKG)_CONFIGURE_FLAGS_OPTION) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --host='$(TARGET)' \ --build="`config.guess`" \ --enable-shared \ @@ -56,12 +56,12 @@ $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' haslibarule= $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install haslibarule= - $(INSTALL) -m644 '$(1)/src/include/pg_config.h' '$(PREFIX)/$(TARGET)/include/' - $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m644 '$(1)/src/include/pg_config.h' '$(HOST_PREFIX)/include/' + $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(HOST_PREFIX)/include/' # Build a native pg_config. $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile cd '$(1).native' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-rpath \ --without-tcl \ @@ -81,5 +81,5 @@ --with-system-tzdata=/dev/null $(MAKE) -C '$(1).native'/src/port -j '$(JOBS)' $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install - $(LN_SF) '$(PREFIX)/$(TARGET)/bin/pg_config' '$(PREFIX)/bin/$(TARGET)-pg_config' + $(LN_SF) '$(HOST_PREFIX)/bin/pg_config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' endef
--- a/src/proj.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/proj.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,10 +20,10 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --with-mutex $(MAKE) -C '$(1)' -j '$(JOBS)' # remove header which is not installed since 4.8.0 - rm -f '$(PREFIX)/$(TARGET)'/include/projects.h + rm -f '$(HOST_PREFIX)'/include/projects.h $(MAKE) -C '$(1)' -j 1 install endef
--- a/src/protobuf.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/protobuf.mk Sun Jun 02 10:31:04 2013 -0400 @@ -25,7 +25,7 @@ # Second step: Build for target system. cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --with-zlib \ --with-protoc=src/protoc_host @@ -34,6 +34,6 @@ '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-protobuf.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-protobuf.exe' \ `'$(TARGET)-pkg-config' protobuf --cflags --libs` endef
--- a/src/pstoedit.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/pstoedit.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)/.build' && '$(1)/configure' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install endef
--- a/src/qdbm.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/qdbm.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-lzo \ --enable-bzip \ --enable-zlib \ @@ -30,15 +30,15 @@ MYLIBS=libqdbm.a \ AR=i686-pc-mingw32-ar \ RANLIB=i686-pc-mingw32-ranlib - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' - $(INSTALL) -m644 '$(1)/libqdbm.a' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -m644 '$(1)/qdbm.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -d '$(HOST_PREFIX)/lib/pkgconfig' + $(INSTALL) -m644 '$(1)/libqdbm.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -m644 '$(1)/qdbm.pc' '$(HOST_PREFIX)/lib/pkgconfig/' + $(INSTALL) -d '$(HOST_PREFIX)/include' cd '$(1)' && $(INSTALL) -m644 depot.h curia.h relic.h hovel.h \ - cabin.h villa.h vista.h odeum.h '$(PREFIX)/$(TARGET)/include/' + cabin.h villa.h vista.h odeum.h '$(HOST_PREFIX)/include/' '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-qdbm.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-qdbm.exe' \ `'$(TARGET)-pkg-config' qdbm --cflags --libs` endef
--- a/src/qhull.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/qhull.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,6 +22,6 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install endef
--- a/src/qjson.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/qjson.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,7 +16,7 @@ endef define $(PKG)_BUILD - echo '$(PREFIX)/bin/$(TARGET)-qmake' + echo '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
--- a/src/qrupdate.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/qrupdate.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ cd '$(1)/.build' && '$(1)/configure' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install endef
--- a/src/qscintilla.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/qscintilla.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,7 +16,7 @@ ifneq ($(MXE_NATIVE_BUILD),yes) ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_QMAKE_SPEC_OPTION := -spec '$(PREFIX)/$(TARGET)/mkspecs/win32-g++' + $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++' endif endif
--- a/src/qt.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/qt.mk Sun Jun 02 10:31:04 2013 -0400 @@ -56,7 +56,7 @@ -release \ -exceptions \ -shared \ - -prefix '$(PREFIX)/$(TARGET)' \ + -prefix '$(HOST_PREFIX)' \ -prefix-install \ -script \ -no-iconv \ @@ -87,10 +87,10 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - $(LN_SF) '$(MXE_BINDIR)/moc' '$(PREFIX)/bin/$(TARGET)-moc' - $(LN_SF) '$(MXE_BINDIR)/rcc' '$(PREFIX)/bin/$(TARGET)-roc' - $(LN_SF) '$(MXE_BINDIR)/uic' '$(PREFIX)/bin/$(TARGET)-uic' - $(LN_SF) '$(MXE_BINDIR)/qmake' '$(PREFIX)/bin/$(TARGET)-qmake' + $(LN_SF) '$(MXE_BINDIR)/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-moc' + $(LN_SF) '$(MXE_BINDIR)/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-roc' + $(LN_SF) '$(MXE_BINDIR)/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-uic' + $(LN_SF) '$(MXE_BINDIR)/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' # cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro # $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install @@ -104,7 +104,7 @@ # lrelease (from linguist) needed by octave for GUI build $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install - $(LN_SF) '$(MXE_BINDIR)/lrelease' '$(PREFIX)/bin/$(TARGET)-lrelease' + $(LN_SF) '$(MXE_BINDIR)/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-lrelease' # mkdir '$(1)/test-qt' # cd '$(1)/test-qt' && '$(TARGET)-qmake' '$(PWD)/$(2).pro'
--- a/src/qwt.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/qwt.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,13 +18,13 @@ define $(PKG)_BUILD # build - cd '$(1)/src' && $(PREFIX)/bin/$(TARGET)-qmake + cd '$(1)/src' && $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake $(MAKE) -C '$(1)/src' -f 'Makefile.Release' -j '$(JOBS)' install #build sinusplot example to test linkage - cd '$(1)/examples/sinusplot' && $(PREFIX)/bin/$(TARGET)-qmake + cd '$(1)/examples/sinusplot' && $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake $(MAKE) -C '$(1)/examples/sinusplot' -f 'Makefile.Release' -j '$(JOBS)' # install - $(INSTALL) -m755 '$(1)/examples/bin/sinusplot.exe' '$(PREFIX)/$(TARGET)/bin/test-qwt.exe' + $(INSTALL) -m755 '$(1)/examples/bin/sinusplot.exe' '$(HOST_PREFIX)/bin/test-qwt.exe' endef
--- a/src/qwtplot3d.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/qwtplot3d.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,11 +16,11 @@ endef define $(PKG)_BUILD - cd '$(1)' && '$(PREFIX)/bin/$(TARGET)-qmake' + cd '$(1)' && '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/lib/libqwtplot3d.a' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/qwtplot3d' - $(INSTALL) -m644 '$(1)/include'/*.h '$(PREFIX)/$(TARGET)/include/qwtplot3d/' + $(INSTALL) -d '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)/lib/libqwtplot3d.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -d '$(HOST_PREFIX)/include/qwtplot3d' + $(INSTALL) -m644 '$(1)/include'/*.h '$(HOST_PREFIX)/include/qwtplot3d/' endef
--- a/src/readline.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/readline.mk Sun Jun 02 10:31:04 2013 -0400 @@ -34,7 +34,7 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-multibyte \ --without-purify $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/sdl.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/sdl.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,16 +21,16 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-threads \ --enable-directx \ --disable-stdio-redirect $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(LN_SF) '$(PREFIX)/$(TARGET)/bin/sdl-config' '$(PREFIX)/bin/$(TARGET)-sdl-config' + $(LN_SF) '$(HOST_PREFIX)/bin/sdl-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-sdl-config' '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-sdl.exe' \ `'$(TARGET)-pkg-config' sdl --cflags --libs` endef
--- a/src/sdl_image.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/sdl_image.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,8 +20,8 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ --disable-sdltest \ --disable-jpg-shared \ --disable-png-shared \ @@ -31,6 +31,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_image.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-sdl_image.exe' \ `'$(TARGET)-pkg-config' SDL_image --cflags --libs` endef
--- a/src/sdl_mixer.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/sdl_mixer.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,14 +20,14 @@ echo \ 'Libs.private:' \ "`$(TARGET)-pkg-config libmodplug --libs`" \ - "`$(PREFIX)/$(TARGET)/bin/smpeg-config --libs`" \ + "`$(HOST_PREFIX)/bin/smpeg-config --libs`" \ >> '$(1)/SDL_mixer.pc.in' $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ --disable-sdltest \ --disable-music-mod \ --enable-music-mod-modplug \ @@ -39,12 +39,12 @@ --disable-music-flac-shared \ --disable-music-mp3-shared \ --disable-smpegtest \ - --with-smpeg-prefix='$(PREFIX)/$(TARGET)' \ + --with-smpeg-prefix='$(HOST_PREFIX)' \ LIBS='-lvorbis -logg' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_mixer.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-sdl_mixer.exe' \ `'$(TARGET)-pkg-config' SDL_mixer --cflags --libs` endef
--- a/src/sdl_net.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/sdl_net.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,14 +19,14 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ --disable-sdltest \ --disable-gui $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_net.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-sdl_net.exe' \ `'$(TARGET)-pkg-config' SDL_net --cflags --libs` endef
--- a/src/sdl_pango.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/sdl_pango.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,8 +21,8 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ --disable-sdltest \ PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/sdl_sound.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/sdl_sound.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,8 +19,8 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ --disable-sdltest \ --enable-voc \ --enable-wav \ @@ -39,13 +39,13 @@ --disable-physfs \ --disable-altcvt \ CFLAGS='-g -O2 -fno-inline' \ - LIBS="`'$(TARGET)-pkg-config' vorbisfile flac speex --libs` `'$(PREFIX)/$(TARGET)/bin/libmikmod-config' --libs`" + LIBS="`'$(TARGET)-pkg-config' vorbisfile flac speex --libs` `'$(HOST_PREFIX)/bin/libmikmod-config' --libs`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ -W -Wall -Werror -std=c99 -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_sound.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-sdl_sound.exe' \ -lSDL_sound \ `'$(TARGET)-pkg-config' sdl vorbisfile flac speex --cflags --libs` \ - `'$(PREFIX)/$(TARGET)/bin/libmikmod-config' --cflags --libs` + `'$(HOST_PREFIX)/bin/libmikmod-config' --cflags --libs` endef
--- a/src/sdl_ttf.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/sdl_ttf.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,9 +19,9 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ --disable-sdltest \ - --with-freetype-prefix='$(PREFIX)/$(TARGET)' + --with-freetype-prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/smpeg.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/smpeg.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,8 +23,8 @@ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-debug \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ --disable-sdltest \ --disable-gtk-player \ --disable-opengl-player \ @@ -33,6 +33,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -std=c99 -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-smpeg.exe' \ - `'$(PREFIX)/$(TARGET)/bin/smpeg-config' --cflags --libs` + '$(2).c' -o '$(HOST_PREFIX)/bin/test-smpeg.exe' \ + `'$(HOST_PREFIX)/bin/smpeg-config' --cflags --libs` endef
--- a/src/sox.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/sox.mk Sun Jun 02 10:31:04 2013 -0400 @@ -25,7 +25,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) @@ -34,6 +34,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sox.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-sox.exe' \ `'$(TARGET)-pkg-config' sox --cflags --libs` endef
--- a/src/speex.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/speex.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-oggtest $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= doc_DATA= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= doc_DATA=
--- a/src/sqlite.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/sqlite.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-readline \ --disable-threadsafe $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/stable-octave.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/stable-octave.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,13 +19,13 @@ cd '$(1)/.build' && '$(1)/configure' \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ - FLTK_CONFIG="$(PREFIX)/bin/$(TARGET)-fltk-config" \ + --prefix='$(HOST_PREFIX)' \ + FLTK_CONFIG="$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-fltk-config" \ gl_cv_func_gettimeofday_clobber=no ## We want both of these install steps so that we install in the ## location set by the configure --prefix option, and the other ## in a directory tree that will have just Octave files. $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(PREFIX)/../octave-stable install + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_DIR)/octave-stable install endef
--- a/src/t4k_common.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/t4k_common.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --with-sdlpango \ --with-sdlnet \ --with-rsvg
--- a/src/termcap.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/termcap.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ AR=$(TARGET)-ar $(MAKE) AR=$(TARGET)-ar -C '$(1)' -j '$(JOBS)' install
--- a/src/texinfo.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/texinfo.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' ## All we need for Octave is makeinfo. $(MAKE) -C '$(1)/.build/lib' -j '$(JOBS)'
--- a/src/theora.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/theora.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,6 +20,6 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_DATA= endef
--- a/src/tiff.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/tiff.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/tinyxml.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/tinyxml.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,13 +19,13 @@ cd '$(1)' && $(TARGET)-g++ -c -O3 -Wall -Wno-unknown-pragmas -Wno-format -D TIXML_USE_STL '$(1)'/*.cpp cd '$(1)' && $(TARGET)-ar cr libtinyxml.a *.o $(TARGET)-ranlib '$(1)/libtinyxml.a' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)'/*.a '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)'/*.h '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -d '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)'/*.a '$(HOST_PREFIX)/lib/' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -m644 '$(1)'/*.h '$(HOST_PREFIX)/include/' '$(TARGET)-g++' \ -W -Wall -D TIXML_USE_STL -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-tinyxml.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-tinyxml.exe' \ -ltinyxml endef
--- a/src/tre.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/tre.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-nls $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/uuid.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/uuid.mk Sun Jun 02 10:31:04 2013 -0400 @@ -15,8 +15,8 @@ define $(PKG)_BUILD if [ $(BUILD_SHARED) = yes ]; then \ - $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/lib/libuuid.a' --install '$(INSTALL)' --libdir '$(PREFIX)/$(TARGET)/lib' --bindir '$(PREFIX)/$(TARGET)/bin'; \ + $(INSTALL) -d '$(HOST_PREFIX)/bin'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/lib/libuuid.a' --install '$(INSTALL)' --libdir '$(HOST_PREFIX)/lib' --bindir '$(HOST_PREFIX)/bin'; \ rm -f '$(PREFIX)/$(TARGET)/lib/libuuid.dll.a'; \ fi endef
--- a/src/vigra.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/vigra.mk Sun Jun 02 10:31:04 2013 -0400 @@ -34,7 +34,7 @@ $(MAKE) -C '$(1)/build' -j '$(JOBS)' install $(TARGET)-g++ \ - '$(2).cpp' -o $(PREFIX)/$(TARGET)/bin/test-vigra.exe \ + '$(2).cpp' -o $(HOST_PREFIX)/bin/test-vigra.exe \ -DVIGRA_STATIC_LIB \ -lvigraimpex `'$(TARGET)-pkg-config' OpenEXR libtiff-4 libpng --cflags --libs` -ljpeg endef
--- a/src/vmime.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/vmime.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,8 +18,8 @@ define $(PKG)_BUILD cd '$(1)' && cmake \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \ - -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \ + -DCMAKE_AR='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ar' \ + -DCMAKE_RANLIB='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ranlib' \ . # Disable VMIME_HAVE_MLANG_H @@ -28,11 +28,11 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' install - $(INSTALL) -m644 '$(1)/vmime/config.hpp' '$(PREFIX)/$(TARGET)/include/vmime/' + $(INSTALL) -m644 '$(1)/vmime/config.hpp' '$(HOST_PREFIX)/include/vmime/' $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp' $(TARGET)-g++ -s -o '$(1)/examples/test-vmime.exe' \ '$(1)/examples/example6.cpp' \ `'$(TARGET)-pkg-config' libvmime --cflags --libs` - $(INSTALL) -m755 '$(1)/examples/test-vmime.exe' '$(PREFIX)/$(TARGET)/bin/' + $(INSTALL) -m755 '$(1)/examples/test-vmime.exe' '$(HOST_PREFIX)/bin/' endef
--- a/src/vorbis.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/vorbis.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/w32api.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/w32api.mk Sun Jun 02 10:31:04 2013 -0400 @@ -16,6 +16,6 @@ endef define $(PKG)_BUILD - $(INSTALL) -d '$(PREFIX)/$(TARGET)' - cp -rpv '$(1)/include' '$(1)/lib' '$(PREFIX)/$(TARGET)' + $(INSTALL) -d '$(HOST_PREFIX)' + cp -rpv '$(1)/include' '$(1)/lib' '$(HOST_PREFIX)' endef
--- a/src/wget.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/wget.mk Sun Jun 02 10:31:04 2013 -0400 @@ -21,7 +21,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --with-ssl=gnutls $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/winpcap.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/winpcap.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,10 +20,10 @@ cd '$(1)' && $(TARGET)-gcc -ICommon -IpacketNtx/Dll -O -c '$(1)/packetNtx/Dll/Packet32.c' $(TARGET)-ar rc '$(1)/libpacket.a' '$(1)/Packet32.o' $(TARGET)-ranlib '$(1)/libpacket.a' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/Common'/*.h '$(PREFIX)/$(TARGET)/include/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/libpacket.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -m644 '$(1)/Common'/*.h '$(HOST_PREFIX)/include/' + $(INSTALL) -d '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)/libpacket.a' '$(HOST_PREFIX)/lib/' mv '$(1)/wpcap/libpcap/Win32/Include/ip6_misc.h' '$(1)/file.tmp' mv '$(1)/file.tmp' '$(1)/wpcap/libpcap/Win32/Include/IP6_misc.h' @@ -32,8 +32,8 @@ AR='$(TARGET)-ar' \ RANLIB='$(TARGET)-ranlib' \ $(MAKE) -C '$(1)/wpcap/PRJ' -j 1 libwpcap.a - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/wpcap/libpcap/'*.h '$(1)/wpcap/Win32-Extensions/'*.h '$(PREFIX)/$(TARGET)/include/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/wpcap/PRJ/libwpcap.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -m644 '$(1)/wpcap/libpcap/'*.h '$(1)/wpcap/Win32-Extensions/'*.h '$(HOST_PREFIX)/include/' + $(INSTALL) -d '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)/wpcap/PRJ/libwpcap.a' '$(HOST_PREFIX)/lib/' endef
--- a/src/wt.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/wt.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,16 +19,16 @@ # build wt libraries mkdir '$(1).build' cd '$(1).build' && cmake \ - -DCONFIGDIR='$(PREFIX)/$(TARGET)/etc/wt' \ + -DCONFIGDIR='$(HOST_PREFIX)/etc/wt' \ -DBUILD_EXAMPLES=OFF \ -DBUILD_TESTS=OFF \ -DSHARED_LIBS=OFF \ -DBOOST_DYNAMIC=OFF \ - -DBOOST_PREFIX='$(PREFIX)/$(TARGET)' \ + -DBOOST_PREFIX='$(HOST_PREFIX)' \ -DBOOST_COMPILER=_win32 \ - -DSSL_PREFIX='$(PREFIX)/$(TARGET)' \ + -DSSL_PREFIX='$(HOST_PREFIX)' \ -DOPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ - -DGM_PREFIX='$(PREFIX)/$(TARGET)' \ + -DGM_PREFIX='$(HOST_PREFIX)' \ -DGM_LIBS="`'$(TARGET)-pkg-config' --libs-only-l GraphicsMagick++`" \ -DPANGO_FT2_LIBS="`'$(TARGET)-pkg-config' --libs-only-l pangoft2`" \ -DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt' \
--- a/src/wxwidgets.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/wxwidgets.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-compat24 \ --enable-compat26 \ --enable-gui \ @@ -59,7 +59,7 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= -$(MAKE) -C '$(1)/locale' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= allmo $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= - $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/wx-config' '$(PREFIX)/bin/$(TARGET)-wx-config' + $(INSTALL) -m755 '$(HOST_PREFIX)/bin/wx-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wx-config' # build the wxWidgets variant without unicode support cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets) @@ -71,7 +71,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-compat24 \ --enable-compat26 \ --enable-gui \ @@ -109,18 +109,18 @@ # 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' + mv '$(HOST_PREFIX)/bin/wx-config' '$(HOST_PREFIX)/bin/wx-config-backup' $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __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' + mv '$(HOST_PREFIX)/bin/wx-config' '$(HOST_PREFIX)/bin/wx-config-nounicode' + $(INSTALL) -m755 '$(HOST_PREFIX)/bin/wx-config-nounicode' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wx-config-nounicode' # restore the unicode wx-config script - mv '$(PREFIX)/$(TARGET)/bin/wx-config-backup' '$(PREFIX)/$(TARGET)/bin/wx-config' + mv '$(HOST_PREFIX)/bin/wx-config-backup' '$(HOST_PREFIX)/bin/wx-config' # build test program '$(TARGET)-g++' \ -W -Wall -Werror -pedantic -std=gnu++0x \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-wxwidgets.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-wxwidgets.exe' \ `'$(TARGET)-wx-config' --cflags --libs` endef
--- a/src/x264.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/x264.mk Sun Jun 02 10:31:04 2013 -0400 @@ -17,7 +17,7 @@ cd '$(1)' && ./configure \ --cross-prefix='$(TARGET)'- \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --enable-win32thread $(MAKE) -C '$(1)' -j 1 uninstall
--- a/src/xapian-core.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/xapian-core.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATC) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/xerces.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/xerces.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-sse2 \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-libtool-lock \ --disable-pretty-make \ --disable-threads \ @@ -39,7 +39,7 @@ --enable-msgloader-inmemory \ --disable-msgloader-iconv \ --disable-msgloader-icu \ - --with-curl='$(PREFIX)/$(TARGET)' \ + --with-curl='$(HOST_PREFIX)' \ --without-icu \ LIBS="`$(TARGET)-pkg-config --libs libcurl`" $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= @@ -47,6 +47,6 @@ '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-xerces.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-xerces.exe' \ `'$(TARGET)-pkg-config' xerces-c --cflags --libs` endef
--- a/src/xine-lib.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/xine-lib.mk Sun Jun 02 10:31:04 2013 -0400 @@ -24,7 +24,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-mmap \ --disable-nls \
--- a/src/xmlwrapp.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/xmlwrapp.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= endef
--- a/src/xvidcore.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/xvidcore.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,11 +20,11 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' BUILD_DIR='build' SHARED_LIB= - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/../../src/xvid.h' '$(PREFIX)/$(TARGET)/include/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/build/xvidcore.a' '$(PREFIX)/$(TARGET)/lib/' - $(LN_SF) '$(PREFIX)/$(TARGET)/lib/xvidcore.a' '$(PREFIX)/$(TARGET)/lib/libxvidcore.a' + $(INSTALL) -d '$(HOST_PREFIX)/include' + $(INSTALL) -m644 '$(1)/../../src/xvid.h' '$(HOST_PREFIX)/include/' + $(INSTALL) -d '$(HOST_PREFIX)/lib' + $(INSTALL) -m644 '$(1)/build/xvidcore.a' '$(HOST_PREFIX)/lib/' + $(LN_SF) '$(HOST_PREFIX)/lib/xvidcore.a' '$(HOST_PREFIX)/lib/libxvidcore.a' endef
--- a/src/xz.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/xz.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-threads \ --disable-nls
--- a/src/zlib.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/zlib.mk Sun Jun 02 10:31:04 2013 -0400 @@ -19,7 +19,7 @@ ifeq ($(MXE_NATIVE_BUILD),yes) define $(PKG)_BUILD cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef @@ -27,7 +27,7 @@ define $(PKG)_BUILD cd '$(1)' && CHOST='$(TARGET)' $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --static $(MAKE) -C '$(1)' -j '$(JOBS)' install
--- a/src/zziplib.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/zziplib.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --disable-mmap \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=