Mercurial > mxe-octave
changeset 3014:b6c7244a2f66
Use HOST_BINDIR, HOST_LIBDIR, and HOST_INCDIR instead of MXE_BINDIR, MXE_LIBDIR, and MXE_INCDIR. Attempt to use these variables consistently instead of using $(HOST_PREFIX)/bin, $(HOST_PREFIX)/lib, and $(HOST_PREFIX)/include
line wrap: on
line diff
--- a/Makefile Sun Jun 02 12:40:32 2013 -0400 +++ b/Makefile Sun Jun 02 16:59:24 2013 -0400 @@ -139,9 +139,9 @@ MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll endif -MXE_BINDIR := '$(HOST_PREFIX)/bin' -MXE_LIBDIR := '$(HOST_PREFIX)/lib' -MXE_INCDIR := '$(HOST_PREFIX)/include' +HOST_BINDIR := '$(HOST_PREFIX)/bin' +HOST_LIBDIR := '$(HOST_PREFIX)/lib' +HOST_INCDIR := '$(HOST_PREFIX)/include' ifeq ($(MXE_SYSTEM),mingw) ifneq ($(MXE_NATIVE_BUILD),yes) @@ -153,10 +153,10 @@ NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++ endif else - LD_LIBRARY_PATH := '$(MXE_LIBDIR)' + LD_LIBRARY_PATH := '$(HOST_LIBDIR)' export LD_LIBRARY_PATH - MXE_CPPFLAGS := '-I$(MXE_INCDIR)' - MXE_LDFLAGS := '-L$(MXE_LIBDIR)' + MXE_CPPFLAGS := '-I$(HOST_INCDIR)' + MXE_LDFLAGS := '-L$(HOST_LIBDIR)' endif LN := ln
--- a/src/apr-util.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/apr-util.mk Sun Jun 02 16:59:24 2013 -0400 @@ -27,5 +27,5 @@ --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) '$(HOST_PREFIX)/bin/apu-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-apu-1-config' + $(LN_SF) '$(HOST_BINDIR)/apu-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-apu-1-config' endef
--- a/src/apr.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/apr.mk Sun Jun 02 16:59:24 2013 -0400 @@ -27,5 +27,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) '$(HOST_PREFIX)/bin/apr-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-apr-1-config' + $(LN_SF) '$(HOST_BINDIR)/apr-1-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-apr-1-config' endef
--- a/src/armadillo.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/armadillo.mk Sun Jun 02 16:59:24 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 '$(HOST_PREFIX)/bin/test-armadillo.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-armadillo.exe' \ -larmadillo -llapack -lblas -lgfortran -lboost_serialization-mt -lboost_thread_win32-mt -lboost_system-mt endef
--- a/src/arpack.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/arpack.mk Sun Jun 02 16:59:24 2013 -0400 @@ -33,6 +33,6 @@ fi if [ $(BUILD_SHARED) = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/.build/.libs/libarpack.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)' -llapack -lblas; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/.build/.libs/libarpack.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)' -llapack -lblas; \ fi endef
--- a/src/blas.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/blas.mk Sun Jun 02 16:59:24 2013 -0400 @@ -20,6 +20,6 @@ cd '$(1)' && $(MXE_AR) cr libblas.a *.o if [ $(BUILD_SHARED) = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/libblas.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/libblas.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi endef
--- a/src/boost.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/boost.mk Sun Jun 02 16:59:24 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 '$(HOST_PREFIX)/include/boost/' + rm -rf '$(HOST_INCDIR)/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 @@ -36,16 +36,16 @@ --without-mpi \ --without-python \ --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' \ + --exec-prefix='$(HOST_BINDIR)' \ + --libdir='$(HOST_LIBDIR)' \ + --includedir='$(HOST_INCDIR)' \ + -sEXPAT_INCLUDE='$(HOST_INCDIR)' \ + -sEXPAT_LIBPATH='$(HOST_LIBDIR)' \ stage install '$(TARGET)-g++' \ -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \ - '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-boost.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-boost.exe' \ -DBOOST_THREAD_USE_LIB \ -lboost_serialization-mt \ -lboost_thread_win32-mt \
--- a/src/build-pkg-config.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/build-pkg-config.mk Sun Jun 02 16:59:24 2013 -0400 @@ -18,7 +18,7 @@ mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ --with-internal-glib \ - --with-pc-path='$(MXE_LIBDIR)/pkgconfig' \ + --with-pc-path='$(HOST_LIBDIR)/pkgconfig' \ --prefix='$(BUILD_TOOLS_PREFIX)' $(MAKE) -C '$(1).build' -j '$(JOBS)' rm -f "$(BUILD_TOOLS_PREFIX)/bin/`config.guess`-pkg-config"
--- a/src/bzip2.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/bzip2.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,11 +25,11 @@ CC='$(MXE_CC)' \ AR='$(MXE_AR)' \ RANLIB='$(MXE_RANLIB)' - $(INSTALL) -d '$(MXE_INCDIR)' - $(INSTALL) -m644 '$(1)/bzlib.h' '$(MXE_INCDIR)/' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/bzlib.h' '$(HOST_INCDIR)' if [ $(BUILD_SHARED) = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/libbz2.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/libbz2.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi endef else @@ -41,11 +41,11 @@ CC='$(MXE_CC)' \ AR='$(MXE_AR)' \ RANLIB='$(MXE_RANLIB)' - $(INSTALL) -d '$(MXE_LIBDIR)' - $(INSTALL) -m755 '$(1)/libbz2.so.1.0.6' '$(MXE_LIBDIR)/' - rm -f '$(MXE_LIBDIR)/libbz2.so.1.0' - $(LN_SF) libbz2.so.1.0.6 '$(MXE_LIBDIR)/libbz2.so.1.0' - $(INSTALL) -d '$(MXE_INCDIR)' - $(INSTALL) -m644 '$(1)/bzlib.h' '$(MXE_INCDIR)/' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m755 '$(1)/libbz2.so.1.0.6' '$(HOST_LIBDIR)' + rm -f '$(HOST_LIBDIR)/libbz2.so.1.0' + $(LN_SF) libbz2.so.1.0.6 '$(HOST_LIBDIR)/libbz2.so.1.0' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/bzlib.h' '$(HOST_INCDIR)' endef endif
--- a/src/cblas.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/cblas.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,9 +25,9 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' alllib cd '$(1)' && $(TARGET)-ar cr libcblas.a src/*.o - $(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/' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/libcblas.a' '$(HOST_LIBDIR)' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/include/cblas.h' '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/include/cblas_f77.h' '$(HOST_INCDIR)' endef
--- a/src/cgal.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/cgal.mk Sun Jun 02 16:59:24 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' '$(HOST_PREFIX)/bin/test-cgal.exe' + $(INSTALL) '$(1)/examples/AABB_tree/AABB_polyhedron_edge_example.exe' '$(HOST_BINDIR)/test-cgal.exe' endef
--- a/src/cminpack.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/cminpack.mk Sun Jun 02 16:59:24 2013 -0400 @@ -20,8 +20,8 @@ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)' -j $(JOBS) - $(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/' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/libcminpack.a' '$(HOST_LIBDIR)' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/cminpack.h' '$(HOST_INCDIR)' endef
--- a/src/curl.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/curl.mk Sun Jun 02 16:59:24 2013 -0400 @@ -30,7 +30,7 @@ ## '$(TARGET)-gcc' \ ## -W -Wall -Werror -ansi -pedantic \ -## '$(2).c' -o '$(HOST_PREFIX)/bin/test-curl.exe' \ +## '$(2).c' -o '$(HOST_BINDIR)/test-curl.exe' \ ## `'$(TARGET)-pkg-config' libcurl --cflags --libs` endef
--- a/src/file.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/file.mk Sun Jun 02 16:59:24 2013 -0400 @@ -35,6 +35,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-file.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-file.exe' \ -lmagic -lgnurx -lshlwapi endef
--- a/src/fltk.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/fltk.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,7 +25,7 @@ ## $(SED) -i 's,\$$uname,MINGW,g' '$(1)/configure' cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - DSOFLAGS='-L$(HOST_PREFIX)/lib' \ + DSOFLAGS='-L$(HOST_LIBDIR)' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ @@ -34,5 +34,5 @@ # 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' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-fltk-config' + $(LN_SF) '$(HOST_BINDIR)/fltk-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-fltk-config' endef
--- a/src/fontconfig.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/fontconfig.mk Sun Jun 02 16:59:24 2013 -0400 @@ -18,7 +18,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - FREETYPE_CFLAGS='-I$(HOST_PREFIX)/include/freetype2' \ + FREETYPE_CFLAGS='-I$(HOST_INCDIR)/freetype2' \ FREETYPE_LIBS='-lfreetype' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \
--- a/src/freeglut.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/freeglut.mk Sun Jun 02 16:59:24 2013 -0400 @@ -29,6 +29,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-freeglut.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-freeglut.exe' \ `'$(TARGET)-pkg-config' glut --cflags --libs` endef
--- a/src/freeimage.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/freeimage.mk Sun Jun 02 16:59:24 2013 -0400 @@ -22,13 +22,13 @@ CXX='$(TARGET)-g++' \ CC='$(TARGET)-gcc' \ AR='$(TARGET)-ar' \ - INCDIR='$(HOST_PREFIX)/include' \ - INSTALLDIR='$(HOST_PREFIX)/lib' + INCDIR='$(HOST_INCDIR)' \ + INSTALLDIR='$(HOST_LIBDIR)' $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile.gnu install \ CXX='$(TARGET)-g++' \ CC='$(TARGET)-gcc' \ AR='$(TARGET)-ar' \ - INCDIR='$(HOST_PREFIX)/include' \ - INSTALLDIR='$(HOST_PREFIX)/lib' + INCDIR='$(HOST_INCDIR)' \ + INSTALLDIR='$(HOST_LIBDIR)' endef
--- a/src/freetype.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/freetype.mk Sun Jun 02 16:59:24 2013 -0400 @@ -22,5 +22,5 @@ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install - rm -f $(MXE_LIBDIR)/libfreetype.la + rm -f $(HOST_LIBDIR)/libfreetype.la endef
--- a/src/gcc.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gcc.mk Sun Jun 02 16:59:24 2013 -0400 @@ -95,12 +95,12 @@ $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'") $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install - mkdir -p $(TOP_DIR)/cross-tools/$(MXE_BINDIR) + mkdir -p $(TOP_DIR)/cross-tools/$(HOST_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) "$$@"') \ + echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(HOST_LIBDIR)/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG) "$$@"') \ > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config'
--- a/src/gd.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gd.mk Sun Jun 02 16:59:24 2013 -0400 @@ -33,14 +33,14 @@ --prefix='$(HOST_PREFIX)' \ --with-freetype='$(HOST_PREFIX)' \ --without-x \ - LIBPNG_CONFIG='$(HOST_PREFIX)/bin/libpng-config' \ - CFLAGS='-DNONDLL -DXMD_H -L$(HOST_PREFIX)/lib' \ - LIBS="`$(HOST_PREFIX)/bin/xml2-config --libs`" + LIBPNG_CONFIG='$(HOST_BINDIR)/libpng-config' \ + CFLAGS='-DNONDLL -DXMD_H -L$(HOST_LIBDIR)' \ + LIBS="`$(HOST_BINDIR)/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 '$(HOST_PREFIX)/bin/test-gd.exe' \ - `'$(HOST_PREFIX)/bin/gdlib-config' --cflags` \ - -lgd `'$(HOST_PREFIX)/bin/gdlib-config' --libs` + '$(2).c' -o '$(HOST_BINDIR)/test-gd.exe' \ + `'$(HOST_BINDIR)/gdlib-config' --cflags` \ + -lgd `'$(HOST_BINDIR)/gdlib-config' --libs` endef
--- a/src/gdal.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gdal.mk Sun Jun 02 16:59:24 2013 -0400 @@ -37,8 +37,8 @@ --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-curl='$(HOST_BINDIR)/curl-config' \ + --with-geos='$(HOST_BINDIR)/geos-config' \ --with-pg='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' \ --with-gta='$(HOST_PREFIX)' \ --without-odbc \ @@ -81,5 +81,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) '$(HOST_PREFIX)/bin/gdal-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gdal-config' + $(LN_SF) '$(HOST_BINDIR)/gdal-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gdal-config' endef
--- a/src/geos.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/geos.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,6 +25,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-geos.exe' \ - -lgeos_c `'$(HOST_PREFIX)/bin/geos-config' --cflags --libs` -lstdc++ + '$(2).c' -o '$(HOST_BINDIR)/test-geos.exe' \ + -lgeos_c `'$(HOST_BINDIR)/geos-config' --cflags --libs` -lstdc++ endef
--- a/src/glew.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/glew.mk Sun Jun 02 16:59:24 2013 -0400 @@ -22,9 +22,9 @@ $(TARGET)-ranlib '$(1)/libGLEW.a' $(SED) \ -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|@libdir@|$(HOST_LIBDIR)|g" \ + -e "s|@exec_prefix@|$(HOST_BINDIR)|g" \ + -e "s|@includedir@|$(HOST_INCDIR)/GL|g" \ -e "s|@version@|$(glew_VERSION)|g" \ -e "s|@cflags@|-DGLEW_STATIC|g" \ -e "s|-l@libname@|-lGLEW -lopengl32|g" \ @@ -36,33 +36,33 @@ $(TARGET)-ranlib '$(1)/libGLEWmx.a' $(SED) \ -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|@libdir@|$(HOST_LIBDIR)|g" \ + -e "s|@exec_prefix@|$(HOST_BINDIR)|g" \ + -e "s|@includedir@|$(HOST_INCDIR)/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 '$(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/' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/libGLEW.a' '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/libGLEW.a' '$(HOST_LIBDIR)/libglew32s.a' + $(INSTALL) -m644 '$(1)/libGLEWmx.a' '$(HOST_LIBDIR)' + $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig' + $(INSTALL) -m644 '$(1)/glew.pc' '$(HOST_LIBDIR)/pkgconfig/' + $(INSTALL) -m644 '$(1)/glewmx.pc' '$(HOST_LIBDIR)/pkgconfig/' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -d '$(HOST_INCDIR)/GL' + $(INSTALL) -m644 '$(1)/include/GL/glew.h' '$(1)/include/GL/wglew.h' '$(HOST_INCDIR)/GL/' # Test '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-glew.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-glew.exe' \ `'$(TARGET)-pkg-config' glew --cflags --libs` '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-glewmx.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-glewmx.exe' \ `'$(TARGET)-pkg-config' glewmx --cflags --libs` endef
--- a/src/glib.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/glib.mk Sun Jun 02 16:59:24 2013 -0400 @@ -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' '$(HOST_PREFIX)/bin/' - $(INSTALL) -m755 '$(1).native/gio/glib-compile-resources' '$(HOST_PREFIX)/bin/' + $(INSTALL) -m755 '$(1).native/gio/glib-compile-schemas' '$(HOST_BINDIR)' + $(INSTALL) -m755 '$(1).native/gio/glib-compile-resources' '$(HOST_BINDIR)' endef define $(PKG)_SYMLINK - $(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/' + $(LN_SF) `which glib-genmarshal` '$(HOST_BINDIR)' + $(LN_SF) `which glib-compile-schemas` '$(HOST_BINDIR)' + $(LN_SF) `which glib-compile-resources` '$(HOST_BINDIR)' endef define $(PKG)_BUILD cd '$(1)' && ./autogen.sh - rm -f '$(HOST_PREFIX)/bin/glib-*' + rm -f '$(HOST_BINDIR)/glib-*' $(if $(findstring y,\ $(shell [ -x "`which glib-genmarshal`" ] && \ [ -x "`which glib-compile-schemas`" ] && \ @@ -78,9 +78,9 @@ --disable-inotify \ CXX='$(TARGET)-c++' \ 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' + GLIB_GENMARSHAL='$(HOST_BINDIR)/glib-genmarshal' \ + GLIB_COMPILE_SCHEMAS='$(HOST_BINDIR)/glib-compile-schemas' \ + GLIB_COMPILE_RESOURCES='$(HOST_BINDIR)/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 Sun Jun 02 12:40:32 2013 -0400 +++ b/src/glibmm.mk Sun Jun 02 16:59:24 2013 -0400 @@ -23,7 +23,7 @@ --prefix='$(HOST_PREFIX)' \ CXX='$(TARGET)-c++' \ PKG_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' \ - GLIB_COMPILE_SCHEMAS='$(HOST_PREFIX)/bin/glib-compile-schemas' \ + GLIB_COMPILE_SCHEMAS='$(HOST_BINDIR)/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/gnuplot.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gnuplot.mk Sun Jun 02 16:59:24 2013 -0400 @@ -20,10 +20,10 @@ 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 '$(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 '$(HOST_BINDIR)' + $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(HOST_BINDIR)' + $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(HOST_BINDIR)' + $(INSTALL) -m644 '$(1)/config/mingw/wgnuplot.mnu' '$(HOST_BINDIR)' $(INSTALL) -d '$(TOP_DIR)/gnuplot/bin' $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(TOP_DIR)/gnuplot/bin/'
--- a/src/graphicsmagick.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/graphicsmagick.mk Sun Jun 02 16:59:24 2013 -0400 @@ -42,8 +42,8 @@ --with-xml \ --with-zlib \ --without-x \ - ac_cv_prog_xml2_config='$(HOST_PREFIX)/bin/xml2-config' \ - ac_cv_path_xml2_config='$(HOST_PREFIX)/bin/xml2-config' + ac_cv_prog_xml2_config='$(HOST_BINDIR)/xml2-config' \ + ac_cv_path_xml2_config='$(HOST_BINDIR)/xml2-config' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= endef
--- a/src/gsl.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gsl.mk Sun Jun 02 16:59:24 2013 -0400 @@ -26,6 +26,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-gsl.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-gsl.exe' \ -lgsl endef
--- a/src/gst-plugins-base.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gst-plugins-base.mk Sun Jun 02 16:59:24 2013 -0400 @@ -17,8 +17,8 @@ define $(PKG)_BUILD find '$(1)' -name Makefile.in \ - -exec $(SED) -i 's,glib-mkenums,$(HOST_PREFIX)/bin/glib-mkenums,g' {} \; \ - -exec $(SED) -i 's,glib-genmarshal,$(HOST_PREFIX)/bin/glib-genmarshal,g' {} \; + -exec $(SED) -i 's,glib-mkenums,$(HOST_BINDIR)/glib-mkenums,g' {} \; \ + -exec $(SED) -i 's,glib-genmarshal,$(HOST_BINDIR)/glib-genmarshal,g' {} \; cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \
--- a/src/gst-plugins-good.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gst-plugins-good.mk Sun Jun 02 16:59:24 2013 -0400 @@ -17,8 +17,8 @@ define $(PKG)_BUILD find '$(1)' -name Makefile.in \ - -exec $(SED) -i 's,glib-mkenums,$(HOST_PREFIX)/bin/glib-mkenums,g' {} \; \ - -exec $(SED) -i 's,glib-genmarshal,$(HOST_PREFIX)/bin/glib-genmarshal,g' {} \; + -exec $(SED) -i 's,glib-mkenums,$(HOST_BINDIR)/glib-mkenums,g' {} \; \ + -exec $(SED) -i 's,glib-genmarshal,$(HOST_BINDIR)/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
--- a/src/gstreamer.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gstreamer.mk Sun Jun 02 16:59:24 2013 -0400 @@ -16,8 +16,8 @@ endef define $(PKG)_BUILD - $(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 + $(SED) -i 's,glib-mkenums,$(HOST_BINDIR)/glib-mkenums,g' '$(1)'/gst/Makefile.in + $(SED) -i 's,glib-genmarshal,$(HOST_BINDIR)/glib-genmarshal,g' '$(1)'/gst/Makefile.in cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \
--- a/src/gta.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gta.mk Sun Jun 02 16:59:24 2013 -0400 @@ -27,6 +27,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-gta.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-gta.exe' \ `'$(TARGET)-pkg-config' gta --cflags --libs` endef
--- a/src/gtk2.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gtk2.mk Sun Jun 02 16:59:24 2013 -0400 @@ -36,6 +36,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-gtk2.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-gtk2.exe' \ `'$(TARGET)-pkg-config' gtk+-2.0 --cflags --libs` endef
--- a/src/gtkglext.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gtkglext.mk Sun Jun 02 16:59:24 2013 -0400 @@ -38,6 +38,6 @@ '$(TARGET)-gcc' \ -W -Wall -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-gtkglext.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-gtkglext.exe' \ `'$(TARGET)-pkg-config' gtkglext-1.0 --cflags --libs` endef
--- a/src/gtkglextmm.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gtkglextmm.mk Sun Jun 02 16:59:24 2013 -0400 @@ -30,6 +30,6 @@ '$(TARGET)-g++' \ -W -Wall -Werror -pedantic -std=c++0x \ - '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-gtkglextmm.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-gtkglextmm.exe' \ `'$(TARGET)-pkg-config' gtkglextmm-1.2 --cflags --libs` endef
--- a/src/gtkmm2.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gtkmm2.mk Sun Jun 02 16:59:24 2013 -0400 @@ -29,6 +29,6 @@ '$(TARGET)-g++' \ -W -Wall -Werror -pedantic -std=c++0x \ - '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-gtkmm2.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-gtkmm2.exe' \ `'$(TARGET)-pkg-config' gtkmm-2.4 --cflags --libs` endef
--- a/src/gtksourceview.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/gtksourceview.mk Sun Jun 02 16:59:24 2013 -0400 @@ -23,8 +23,8 @@ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --disable-gtk-doc \ - GLIB_GENMARSHAL='$(HOST_PREFIX)/bin/glib-genmarshal' \ - GLIB_MKENUMS='$(HOST_PREFIX)/bin/glib-mkenums' + GLIB_GENMARSHAL='$(HOST_BINDIR)/glib-genmarshal' \ + GLIB_MKENUMS='$(HOST_BINDIR)/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/guile.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/guile.mk Sun Jun 02 16:59:24 2013 -0400 @@ -33,6 +33,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-guile.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-guile.exe' \ `'$(TARGET)-pkg-config' guile-1.8 --cflags --libs` endef
--- a/src/hunspell.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/hunspell.mk Sun Jun 02 16:59:24 2013 -0400 @@ -30,6 +30,6 @@ # Test '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-hunspell.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-hunspell.exe' \ `'$(TARGET)-pkg-config' hunspell --cflags --libs` endef
--- a/src/imagemagick.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/imagemagick.mk Sun Jun 02 16:59:24 2013 -0400 @@ -22,7 +22,7 @@ $(ENABLE_SHARED_OR_STATIC) \ --with-x=no \ --without-zlib \ - ac_cv_prog_freetype_config='$(HOST_PREFIX)/bin/freetype-config' + ac_cv_prog_freetype_config='$(HOST_BINDIR)/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/json-c.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/json-c.mk Sun Jun 02 16:59:24 2013 -0400 @@ -26,6 +26,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-json-c.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-json-c.exe' \ `'$(TARGET)-pkg-config' json --cflags --libs` endef
--- a/src/lcms1.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/lcms1.mk Sun Jun 02 16:59:24 2013 -0400 @@ -26,5 +26,5 @@ --with-zlib $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= - rm -f $(HOST_PREFIX)/lib/liblcms.la + rm -f $(HOST_LIBDIR)/liblcms.la endef
--- a/src/levmar.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/levmar.mk Sun Jun 02 16:59:24 2013 -0400 @@ -20,6 +20,6 @@ CC=$(TARGET)-gcc \ AR=$(TARGET)-ar \ RANLIB=$(TARGET)-ranlib - $(INSTALL) -m644 '$(1)/levmar.h' '$(HOST_PREFIX)/include/' - $(INSTALL) -m644 '$(1)/liblevmar.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -m644 '$(1)/levmar.h' '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/liblevmar.a' '$(HOST_LIBDIR)' endef
--- a/src/libarchive.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libarchive.mk Sun Jun 02 16:59:24 2013 -0400 @@ -24,12 +24,12 @@ $(ENABLE_SHARED_OR_STATIC) \ --disable-bsdtar \ --disable-bsdcpio \ - XML2_CONFIG='$(HOST_PREFIX)'/bin/xml2-config + XML2_CONFIG='$(HOST_BINDIR)'/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 '$(HOST_PREFIX)/bin/test-libarchive.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-libarchive.exe' \ `'$(TARGET)-pkg-config' --libs-only-l libarchive` endef
--- a/src/libass.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libass.mk Sun Jun 02 16:59:24 2013 -0400 @@ -27,6 +27,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-libass.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-libass.exe' \ `'$(TARGET)-pkg-config' libass --cflags --libs` endef
--- a/src/libf2c.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libf2c.mk Sun Jun 02 16:59:24 2013 -0400 @@ -20,6 +20,6 @@ LD=$(TARGET)-ld \ RANLIB=$(TARGET)-ranlib \ CFLAGS='-O -DUSE_CLOCK' - $(INSTALL) -m644 '$(1)/libf2c.a' '$(HOST_PREFIX)/lib' - $(INSTALL) -m644 '$(1)/f2c.h' '$(HOST_PREFIX)/include' + $(INSTALL) -m644 '$(1)/libf2c.a' '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/f2c.h' '$(HOST_INCDIR)' endef
--- a/src/libffi.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libffi.mk Sun Jun 02 16:59:24 2013 -0400 @@ -26,6 +26,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -std=c99 -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-libffi.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-libffi.exe' \ `'$(TARGET)-pkg-config' libffi --cflags --libs` endef
--- a/src/libgcrypt.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libgcrypt.mk Sun Jun 02 16:59:24 2013 -0400 @@ -23,5 +23,5 @@ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(LN_SF) '$(HOST_PREFIX)/bin/libgcrypt-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-libgcrypt-config' + $(LN_SF) '$(HOST_BINDIR)/libgcrypt-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-libgcrypt-config' endef
--- a/src/libgda.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libgda.mk Sun Jun 02 16:59:24 2013 -0400 @@ -16,9 +16,9 @@ endef define $(PKG)_BUILD - $(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' + $(SED) -i 's,glib-mkenums,'$(HOST_BINDIR)/glib-mkenums',g' '$(1)/libgda/Makefile.in' + $(SED) -i 's,glib-mkenums,'$(HOST_BINDIR)/glib-mkenums',g' '$(1)/libgda/sql-parser/Makefile.in' + $(SED) -i 's,glib-mkenums,'$(HOST_BINDIR)/glib-mkenums',g' '$(1)/libgda-ui/Makefile.in' cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ @@ -32,7 +32,7 @@ --without-java \ --enable-binreloc \ --disable-crypto \ - GLIB_GENMARSHAL='$(HOST_PREFIX)/bin/glib-genmarshal' + GLIB_GENMARSHAL='$(HOST_BINDIR)/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/libgeotiff.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libgeotiff.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,5 +25,5 @@ --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 '$(HOST_PREFIX)'/bin/*.remove-me + rm -fv '$(HOST_BINDIR)'/*.remove-me endef
--- a/src/libgomp.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libgomp.mk Sun Jun 02 16:59:24 2013 -0400 @@ -28,6 +28,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-libgomp.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-libgomp.exe' \ -fopenmp endef
--- a/src/libgpg_error.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libgpg_error.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,5 +25,5 @@ --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) '$(HOST_PREFIX)/bin/gpg-error-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gpg-error-config' + $(LN_SF) '$(HOST_BINDIR)/gpg-error-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gpg-error-config' endef
--- a/src/libgsasl.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libgsasl.mk Sun Jun 02 16:59:24 2013 -0400 @@ -30,6 +30,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-libgsasl.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-libgsasl.exe' \ `'$(TARGET)-pkg-config' libgsasl --cflags --libs` endef
--- a/src/libiberty.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libiberty.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,6 +25,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-libiberty.exe' \ - -I$(HOST_PREFIX)/include/libiberty -liberty + '$(2).c' -o '$(HOST_BINDIR)/test-libiberty.exe' \ + -I$(HOST_INCDIR)/libiberty -liberty endef
--- a/src/libical.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libical.mk Sun Jun 02 16:59:24 2013 -0400 @@ -27,6 +27,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-libical.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-libical.exe' \ `'$(TARGET)-pkg-config' libical --cflags --libs` endef
--- a/src/libiconv.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libiconv.mk Sun Jun 02 16:59:24 2013 -0400 @@ -26,6 +26,6 @@ --disable-nls $(MAKE) -C '$(1)/libcharset' -j '$(JOBS)' install $(MAKE) -C '$(1)/lib' -j '$(JOBS)' install - $(INSTALL) -d '$(HOST_PREFIX)/include' - $(INSTALL) -m644 '$(1)/include/iconv.h.inst' '$(HOST_PREFIX)/include/iconv.h' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/include/iconv.h.inst' '$(HOST_INCDIR)/iconv.h' endef
--- a/src/libircclient.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libircclient.mk Sun Jun 02 16:59:24 2013 -0400 @@ -24,17 +24,17 @@ --enable-threads \ --disable-ipv6 $(MAKE) -C '$(1)'/src -j '$(JOBS)' static - $(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' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/src/libircclient.a' '$(HOST_LIBDIR)' + $(INSTALL) -d '$(HOST_INCDIR)/libircclient' + $(INSTALL) -m644 '$(1)/include/libircclient.h' '$(HOST_INCDIR)/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_errors.h' '$(HOST_INCDIR)/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_events.h' '$(HOST_INCDIR)/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_rfcnumeric.h' '$(HOST_INCDIR)/libircclient' + $(INSTALL) -m644 '$(1)/include/libirc_options.h' '$(HOST_INCDIR)/libircclient' '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-libircclient.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-libircclient.exe' \ -lircclient -lws2_32 endef
--- a/src/libmikmod.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libmikmod.mk Sun Jun 02 16:59:24 2013 -0400 @@ -26,12 +26,12 @@ ./configure \ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ - --libdir='$(HOST_PREFIX)/lib' \ + --libdir='$(HOST_LIBDIR)' \ --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 '$(HOST_PREFIX)/bin/test-libmikmod.exe' \ - `'$(HOST_PREFIX)/bin/libmikmod-config' --cflags --libs` + '$(2).c' -o '$(HOST_BINDIR)/test-libmikmod.exe' \ + `'$(HOST_BINDIR)/libmikmod-config' --cflags --libs` endef
--- a/src/libmng.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libmng.mk Sun Jun 02 16:59:24 2013 -0400 @@ -31,5 +31,5 @@ -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' '$(HOST_PREFIX)/lib/pkgconfig/' + $(INSTALL) -m644 '$(1)/libmng.pc' '$(HOST_LIBDIR)/pkgconfig/' endef
--- a/src/libmodplug.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libmodplug.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,6 +25,6 @@ '$(TARGET)-gcc' \ -W -Wall -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-libmodplug.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-libmodplug.exe' \ `'$(TARGET)-pkg-config' libmodplug --cflags --libs` endef
--- a/src/liboauth.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/liboauth.mk Sun Jun 02 16:59:24 2013 -0400 @@ -26,6 +26,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-liboauth.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-liboauth.exe' \ `'$(TARGET)-pkg-config' oauth --cflags --libs` endef
--- a/src/libpano13.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libpano13.mk Sun Jun 02 16:59:24 2013 -0400 @@ -26,10 +26,10 @@ --prefix='$(HOST_PREFIX)' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ - --with-jpeg='$(HOST_PREFIX)'/lib \ - --with-tiff='$(HOST_PREFIX)'/lib \ - --with-png='$(HOST_PREFIX)'/lib \ - --with-zlib='$(HOST_PREFIX)'/lib \ + --with-jpeg='$(HOST_LIBDIR)' \ + --with-tiff='$(HOST_LIBDIR)' \ + --with-png='$(HOST_LIBDIR)' \ + --with-zlib='$(HOST_LIBDIR)' \ LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= endef
--- a/src/libpng.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libpng.mk Sun Jun 02 16:59:24 2013 -0400 @@ -29,6 +29,6 @@ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - rm -f $(MXE_LIBDIR)/libpng.la - rm -f $(MXE_LIBDIR)/libpng15.la + rm -f $(HOST_LIBDIR)/libpng.la + rm -f $(HOST_LIBDIR)/libpng15.la endef
--- a/src/librsvg.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/librsvg.mk Sun Jun 02 16:59:24 2013 -0400 @@ -28,6 +28,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-librsvg.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-librsvg.exe' \ `'$(TARGET)-pkg-config' librsvg-2.0 --cflags --libs` endef
--- a/src/libssh2.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libssh2.mk Sun Jun 02 16:59:24 2013 -0400 @@ -30,7 +30,7 @@ ## '$(TARGET)-gcc' \ ## -W -Wall -Werror -ansi -pedantic \ -## '$(2).c' -o '$(HOST_PREFIX)/bin/test-libssh2.exe' \ +## '$(2).c' -o '$(HOST_BINDIR)/test-libssh2.exe' \ ## `'$(TARGET)-pkg-config' --cflags --libs libssh2` endef
--- a/src/libusb.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libusb.mk Sun Jun 02 16:59:24 2013 -0400 @@ -29,9 +29,9 @@ --def libusb0.def \ --output-lib libusb.a - $(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/' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/src/lusb0_usb.h' '$(HOST_INCDIR)' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/libusb.a' '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/libusbd.a' '$(HOST_LIBDIR)' endef
--- a/src/libvpx.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libvpx.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,5 +25,5 @@ --disable-install-docs $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - $(TARGET)-ranlib $(HOST_PREFIX)/lib/libvpx.a + $(TARGET)-ranlib $(HOST_LIBDIR)/libvpx.a endef
--- a/src/libxslt.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/libxslt.mk Sun Jun 02 16:59:24 2013 -0400 @@ -23,7 +23,7 @@ --without-debug \ --prefix='$(HOST_PREFIX)' \ --with-libxml-prefix='$(HOST_PREFIX)' \ - LIBGCRYPT_CONFIG='$(HOST_PREFIX)/bin/libgcrypt-config' \ + LIBGCRYPT_CONFIG='$(HOST_BINDIR)/libgcrypt-config' \ --without-python \ --without-plugins $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/llvm.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/llvm.mk Sun Jun 02 16:59:24 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) '$(HOST_PREFIX)/bin/llvm-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-llvm-config' + $(LN_SF) '$(HOST_BINDIR)/llvm-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-llvm-config' endef
--- a/src/log4cxx.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/log4cxx.mk Sun Jun 02 16:59:24 2013 -0400 @@ -31,6 +31,6 @@ '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-log4cxx.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-log4cxx.exe' \ `$(TARGET)-pkg-config liblog4cxx --libs` endef
--- a/src/lua.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/lua.mk Sun Jun 02 16:59:24 2013 -0400 @@ -32,6 +32,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-lua.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-lua.exe' \ -llua endef
--- a/src/mpfr.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/mpfr.mk Sun Jun 02 16:59:24 2013 -0400 @@ -23,8 +23,8 @@ $(ENABLE_SHARED_OR_STATIC) \ --prefix='$(HOST_PREFIX)' \ --enable-threads=win32 \ - --with-gmp-include='$(HOST_PREFIX)/include/' - --with-gmp-lib='$(HOST_PREFIX)/lib/' + --with-gmp-include='$(HOST_INCDIR)' + --with-gmp-lib='$(HOST_LIBDIR)' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/mxml.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/mxml.mk Sun Jun 02 16:59:24 2013 -0400 @@ -23,13 +23,13 @@ --enable-threads $(MAKE) -C '$(1)' -j '$(JOBS)' libmxml.a $(MAKE) -C '$(1)' -j 1 install-libmxml.a - $(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/' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/mxml.h' '$(HOST_INCDIR)' + $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig' + $(INSTALL) -m644 '$(1)/mxml.pc' '$(HOST_LIBDIR)/pkgconfig' '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-mxml.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-mxml.exe' \ `'$(TARGET)-pkg-config' mxml --cflags --libs` endef
--- a/src/native-gcc.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/native-gcc.mk Sun Jun 02 16:59:24 2013 -0400 @@ -51,14 +51,14 @@ --disable-libmudflap \ --with-mpfr-include='$(1)/mpfr/src' \ --with-mpfr-lib='$(1).build/mpfr/src/.libs' \ - --with-native-system-header-dir=$(MXE_INCDIR) \ + --with-native-system-header-dir=$(HOST_INCDIR) \ $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'") $(MAKE) -C '$(1).build' -j '$(JOBS)' $(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) "$$@"') \ + # echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(HOST_LIBDIR)/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG) "$$@"') \ # > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' # chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config'
--- a/src/nettle.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/nettle.mk Sun Jun 02 16:59:24 2013 -0400 @@ -27,9 +27,9 @@ $(MAKE) -C '$(1)' -j 1 install if [ -d $(HOST_PREFIX)/lib64 ]; then \ - $(INSTALL) -d $(MXE_LIBDIR)/pkgconfig; \ - mv $(HOST_PREFIX)/lib64/pkgconfig/* $(MXE_LIBDIR)/pkgconfig; \ + $(INSTALL) -d $(HOST_LIBDIR)/pkgconfig; \ + mv $(HOST_PREFIX)/lib64/pkgconfig/* $(HOST_LIBDIR)/pkgconfig; \ rmdir $(HOST_PREFIX)/lib64/pkgconfig; \ - mv $(HOST_PREFIX)/lib64/* $(MXE_LIBDIR); \ + mv $(HOST_PREFIX)/lib64/* $(HOST_LIBDIR); \ fi endef
--- a/src/nsis.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/nsis.mk Sun Jun 02 16:59:24 2013 -0400 @@ -24,5 +24,5 @@ `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \ SKIPUTILS='NSIS Menu' \ install - $(INSTALL) -m755 '$(HOST_PREFIX)/bin/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-makensis' + $(INSTALL) -m755 '$(HOST_BINDIR)/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-makensis' endef
--- a/src/ocaml-core.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/ocaml-core.mk Sun Jun 02 16:59:24 2013 -0400 @@ -27,8 +27,8 @@ # match Windows' int type. (That's what -cc and -host are for). cd '$(1)' && ./configure \ -prefix '$(HOST_PREFIX)' \ - -bindir '$(HOST_PREFIX)/bin' \ - -libdir '$(HOST_PREFIX)/lib/ocaml' \ + -bindir '$(HOST_BINDIR)' \ + -libdir '$(HOST_LIBDIR)/ocaml' \ -no-tk \ -cc "gcc -m32" \ -no-shared-libs \ @@ -45,8 +45,8 @@ $(MAKE) -C '$(1)' all # install ocamldoc and camlp4 (non cross versions) $(MAKE) -C '$(1)/ocamldoc' install - cd '$(1)' && BINDIR=$(HOST_PREFIX)/bin \ - LIBDIR=$(HOST_PREFIX)/lib/ocaml \ + cd '$(1)' && BINDIR=$(HOST_BINDIR) \ + LIBDIR=$(HOST_LIBDIR)/ocaml \ PREFIX=$(HOST_PREFIX) \ ./build/partial-install.sh @@ -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 $(HOST_PREFIX)/bin/$$f $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-$$f; \ + cp -f $(HOST_BINDIR)/$$f $(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-$$f; \ done # test ocamlopt
--- a/src/ocaml-flexdll.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/ocaml-flexdll.mk Sun Jun 02 16:59:24 2013 -0400 @@ -20,19 +20,19 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' \ CHAINS=mingw \ MINGW_PREFIX=$(TARGET) \ - OCAMLOPT=$(HOST_PREFIX)/bin/ocaml-native/ocamlopt \ + OCAMLOPT=$(HOST_BINDIR)/ocaml-native/ocamlopt \ all - mkdir -p '$(HOST_PREFIX)/lib/ocaml/flexdll' + mkdir -p '$(HOST_LIBDIR)/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 '$(HOST_PREFIX)/include' + cd '$(1)' && $(INSTALL) -m 0755 flexdll.h '$(HOST_INCDIR)' cd '$(1)' && $(INSTALL) -m 0755 flexlink flexdll_mingw.o \ flexdll_initer_mingw.o \ - '$(HOST_PREFIX)/lib/ocaml/flexdll' + '$(HOST_LIBDIR)/ocaml/flexdll' # create flexdll scripts - cd '$(BUILD_TOOLS_PREFIX)/bin' && $(LN_SF) '$(HOST_PREFIX)/lib/ocaml/flexdll/flexlink' + cd '$(BUILD_TOOLS_PREFIX)/bin' && $(LN_SF) '$(HOST_LIBDIR)/ocaml/flexdll/flexlink' (echo '#!/bin/sh'; \ - echo 'exec flexlink -I $(HOST_PREFIX)/lib -chain mingw -nocygpath "$$@"') \ + echo 'exec flexlink -I $(HOST_LIBDIR) -chain mingw -nocygpath "$$@"') \ > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-flexlink' chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-flexlink'
--- a/src/ocaml-native.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/ocaml-native.mk Sun Jun 02 16:59:24 2013 -0400 @@ -20,8 +20,8 @@ # patched ocaml source to get ocamlbuild use $(TARGET)-ocamlc, $(TARGET)-ocamlfind, ... cd '$(1)' && ./configure \ -prefix '$(HOST_PREFIX)' \ - -bindir '$(HOST_PREFIX)/bin/ocaml-native' \ - -libdir '$(HOST_PREFIX)/lib/ocaml-native' \ + -bindir '$(HOST_BINDIR)/ocaml-native' \ + -libdir '$(HOST_LIBDIR)/ocaml-native' \ -no-tk \ -no-shared-libs \ -verbose
--- a/src/octave.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/octave.mk Sun Jun 02 16:59:24 2013 -0400 @@ -29,7 +29,7 @@ cd '$(1)' && autoreconf -W none cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) \ - LDFLAGS='-Wl,-rpath-link,$(MXE_LIBDIR) -L$(MXE_LIBDIR)' \ + LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)' \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $($(PKG)_CROSS_CONFIG_OPTIONS)
--- a/src/old.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/old.mk Sun Jun 02 16:59:24 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 '$(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/' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/libold.a' '$(HOST_LIBDIR)' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/lib/old.h' '$(HOST_INCDIR)' endef
--- a/src/openal.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/openal.mk Sun Jun 02 16:59:24 2013 -0400 @@ -24,6 +24,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-openal.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-openal.exe' \ `'$(TARGET)-pkg-config' openal --cflags --libs` endef
--- a/src/opencsg.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/opencsg.mk Sun Jun 02 16:59:24 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' '$(HOST_PREFIX)/include/' - $(INSTALL) -m644 '$(1)/lib/libopencsg.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -m644 '$(1)/include/opencsg.h' '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/lib/libopencsg.a' '$(HOST_LIBDIR)' cd '$(1)/example' && '$(TARGET)-qmake' example.pro $(MAKE) -C '$(1)/example' -j '$(JOBS)' - $(INSTALL) -m755 '$(1)/example/release/opencsgexample.exe' '$(HOST_PREFIX)/bin/test-opencsg.exe' + $(INSTALL) -m755 '$(1)/example/release/opencsgexample.exe' '$(HOST_BINDIR)/test-opencsg.exe' endef
--- a/src/openssl.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/openssl.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,7 +25,7 @@ endef define $(PKG)_BUILD - cd '$(1)' && CC='$(MXE_CC) -I$(MXE_INCDIR) -L$(MXE_LIBDIR)' \ + cd '$(1)' && CC='$(MXE_CC) -I$(HOST_INCDIR) -L$(HOST_LIBDIR)' \ $($(PKG)_CONFIGURE) \ zlib \ shared \ @@ -33,7 +33,7 @@ --prefix='$(HOST_PREFIX)' \ --libdir=lib $(MAKE) -C '$(1)' install -j 1 \ - CC='$(MXE_CC) -I$(MXE_INCDIR) -L$(MXE_LIBDIR)' \ + CC='$(MXE_CC) -I$(HOST_INCDIR) -L$(HOST_LIBDIR)' \ RANLIB='$(MXE_RANLIB)' \ $($(PKG)_CROSS_COMPILE_MAKE_ARG) \ AR='$(MXE_AR) rcu'
--- a/src/pcre.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/pcre.mk Sun Jun 02 16:59:24 2013 -0400 @@ -32,5 +32,5 @@ --disable-pcretest-libreadline rm -f '$(HOST_PREFIX)'/share/man/man3/pcre16*.3 $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(INSTALL) -m755 $(HOST_PREFIX)/bin/pcre-config $(BUILD_TOOLS_PREFIX)/bin/pcre-config + $(INSTALL) -m755 $(HOST_BINDIR)/pcre-config $(BUILD_TOOLS_PREFIX)/bin/pcre-config endef
--- a/src/pdcurses.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/pdcurses.mk Sun Jun 02 16:59:24 2013 -0400 @@ -27,13 +27,13 @@ mv '$(1)/pdcurses.a' '$(1)/libcurses.a' $(TARGET)-ranlib '$(1)/libcurses.a' '$(1)/panel.a' if [ "$(BUILD_SHARED)" = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/libcurses.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/panel.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/libcurses.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/panel.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi if [ "$(BUILD_STATIC)" = yes ]; then \ - $(INSTALL) -m644 '$(1)/libcurses.a' '$(MXE_LIBDIR)/libcurses.a' - $(INSTALL) -m644 '$(1)/panel.a' '$(MXE_LIBDIR)/libpanel.a' + $(INSTALL) -m644 '$(1)/libcurses.a' '$(HOST_LIBDIR)/libcurses.a' + $(INSTALL) -m644 '$(1)/panel.a' '$(HOST_LIBDIR)/libpanel.a' fi - $(INSTALL) -d '$(HOST_PREFIX)/include/' - $(INSTALL) -m644 '$(1)/curses.h' '$(1)/panel.h' '$(1)/term.h' '$(MXE_INCDIR)' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/curses.h' '$(1)/panel.h' '$(1)/term.h' '$(HOST_INCDIR)' endef
--- a/src/physfs.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/physfs.mk Sun Jun 02 16:59:24 2013 -0400 @@ -26,6 +26,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic -std=c99 \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-physfs.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-physfs.exe' \ -lphysfs -lz endef
--- a/src/poco.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/poco.mk Sun Jun 02 16:59:24 2013 -0400 @@ -24,6 +24,6 @@ '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-poco.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-poco.exe' \ -lPocoFoundation endef
--- a/src/poppler.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/poppler.mk Sun Jun 02 16:59:24 2013 -0400 @@ -52,7 +52,7 @@ # Test program '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cxx' -o '$(HOST_PREFIX)/bin/test-poppler.exe' \ + '$(2).cxx' -o '$(HOST_BINDIR)/test-poppler.exe' \ `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs` endef
--- a/src/portaudio.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/portaudio.mk Sun Jun 02 16:59:24 2013 -0400 @@ -30,6 +30,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-portaudio.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-portaudio.exe' \ `'$(TARGET)-pkg-config' portaudio-2.0 --cflags --libs` endef
--- a/src/postgresql.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/postgresql.mk Sun Jun 02 16:59:24 2013 -0400 @@ -55,8 +55,8 @@ $(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' '$(HOST_PREFIX)/include/' - $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(HOST_PREFIX)/include/' + $(INSTALL) -m644 '$(1)/src/include/pg_config.h' '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(HOST_INCDIR)' # Build a native pg_config. $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile cd '$(1).native' && ./configure \ @@ -80,5 +80,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) '$(HOST_PREFIX)/bin/pg_config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' + $(LN_SF) '$(HOST_BINDIR)/pg_config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pg_config' endef
--- a/src/proj.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/proj.mk Sun Jun 02 16:59:24 2013 -0400 @@ -24,6 +24,6 @@ --with-mutex $(MAKE) -C '$(1)' -j '$(JOBS)' # remove header which is not installed since 4.8.0 - rm -f '$(HOST_PREFIX)'/include/projects.h + rm -f '$(HOST_INCDIR)/projects.h' $(MAKE) -C '$(1)' -j 1 install endef
--- a/src/protobuf.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/protobuf.mk Sun Jun 02 16:59:24 2013 -0400 @@ -34,6 +34,6 @@ '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-protobuf.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-protobuf.exe' \ `'$(TARGET)-pkg-config' protobuf --cflags --libs` endef
--- a/src/pthreads.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/pthreads.mk Sun Jun 02 16:59:24 2013 -0400 @@ -17,17 +17,17 @@ ifeq ($(MXE_SYSTEM),mingw) define $(PKG)_BUILD $(MAKE) -C '$(1)' -j 1 GC-static CROSS='$(TARGET)-' - $(INSTALL) -d '$(MXE_LIBDIR)' - $(INSTALL) -m644 '$(1)/libpthreadGC2.a' '$(MXE_LIBDIR)/libpthread.a' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/libpthreadGC2.a' '$(HOST_LIBDIR)/libpthread.a' if [ $(BUILD_SHARED) = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(MXE_LIBDIR)/libpthread.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(HOST_LIBDIR)/libpthread.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi - $(INSTALL) -d '$(MXE_INCDIR)' - $(INSTALL) -m644 '$(1)/pthread.h' '$(MXE_INCDIR)/' - $(INSTALL) -m644 '$(1)/sched.h' '$(MXE_INCDIR)/' - $(INSTALL) -m644 '$(1)/semaphore.h' '$(MXE_INCDIR)/' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/pthread.h' '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/sched.h' '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/semaphore.h' '$(HOST_INCDIR)' endef else define $(PKG)_BUILD
--- a/src/qdbm.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/qdbm.mk Sun Jun 02 16:59:24 2013 -0400 @@ -30,15 +30,15 @@ MYLIBS=libqdbm.a \ AR=i686-pc-mingw32-ar \ RANLIB=i686-pc-mingw32-ranlib - $(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' + $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig' + $(INSTALL) -m644 '$(1)/libqdbm.a' '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/qdbm.pc' '$(HOST_LIBDIR)/pkgconfig/' + $(INSTALL) -d '$(HOST_INCDIR)' cd '$(1)' && $(INSTALL) -m644 depot.h curia.h relic.h hovel.h \ - cabin.h villa.h vista.h odeum.h '$(HOST_PREFIX)/include/' + cabin.h villa.h vista.h odeum.h '$(HOST_INCDIR)' '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-qdbm.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-qdbm.exe' \ `'$(TARGET)-pkg-config' qdbm --cflags --libs` endef
--- a/src/qscintilla.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/qscintilla.mk Sun Jun 02 16:59:24 2013 -0400 @@ -21,11 +21,11 @@ endif define $(PKG)_BUILD - cd '$(1)' && '$(MXE_BINDIR)/qmake' -makefile $($(PKG)_QMAKE_SPEC_OPTION) + cd '$(1)' && '$(HOST_BINDIR)/qmake' -makefile $($(PKG)_QMAKE_SPEC_OPTION) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install if [ $(MXE_SYSTEM) = mingw ]; then \ - $(INSTALL) -m755 '$(MXE_LIBDIR)/qscintilla2.dll' '$(MXE_BINDIR)/qscintilla2.dll'; \ + $(INSTALL) -m755 '$(HOST_LIBDIR)/qscintilla2.dll' '$(HOST_BINDIR)/qscintilla2.dll'; \ fi endef
--- a/src/qt.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/qt.mk Sun Jun 02 16:59:24 2013 -0400 @@ -18,12 +18,12 @@ $(PKG)_DEPS := gcc postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus $(PKG)_CONFIGURE_ENV := \ - CPPFLAGS='$(MXE_INCDIR)/dbus-1.0' \ - LDFLAGS='-Wl,-rpath-link,$(MXE_LIBDIR) -L$(MXE_LIBDIR)' + CPPFLAGS='$(HOST_INCDIR)/dbus-1.0' \ + LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)' endif ifeq ($(MXE_NATIVE_BUILD),yes) - $(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(MXE_INCDIR)' + $(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(HOST_INCDIR)' $(PKG)_CONFIGURE_DATABASE_OPTION := -qt-sql-psql else ifeq ($(MXE_SYSTEM),mingw) @@ -87,10 +87,10 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - $(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' + $(LN_SF) '$(HOST_BINDIR)/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-moc' + $(LN_SF) '$(HOST_BINDIR)/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-roc' + $(LN_SF) '$(HOST_BINDIR)/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-uic' + $(LN_SF) '$(HOST_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,10 +104,10 @@ # lrelease (from linguist) needed by octave for GUI build $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install - $(LN_SF) '$(MXE_BINDIR)/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-lrelease' + $(LN_SF) '$(HOST_BINDIR)/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-lrelease' # mkdir '$(1)/test-qt' # cd '$(1)/test-qt' && '$(TARGET)-qmake' '$(PWD)/$(2).pro' # $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' - # $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(MXE_BINDIR)/' + # $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(HOST_BINDIR)' endef
--- a/src/qwt.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/qwt.mk Sun Jun 02 16:59:24 2013 -0400 @@ -26,5 +26,5 @@ $(MAKE) -C '$(1)/examples/sinusplot' -f 'Makefile.Release' -j '$(JOBS)' # install - $(INSTALL) -m755 '$(1)/examples/bin/sinusplot.exe' '$(HOST_PREFIX)/bin/test-qwt.exe' + $(INSTALL) -m755 '$(1)/examples/bin/sinusplot.exe' '$(HOST_BINDIR)/test-qwt.exe' endef
--- a/src/qwtplot3d.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/qwtplot3d.mk Sun Jun 02 16:59:24 2013 -0400 @@ -18,9 +18,9 @@ define $(PKG)_BUILD cd '$(1)' && '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' - $(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/' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/lib/libqwtplot3d.a' '$(HOST_LIBDIR)' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -d '$(HOST_INCDIR)/qwtplot3d' + $(INSTALL) -m644 '$(1)/include'/*.h '$(HOST_INCDIR)/qwtplot3d' endef
--- a/src/sdl.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/sdl.mk Sun Jun 02 16:59:24 2013 -0400 @@ -27,10 +27,10 @@ --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) '$(HOST_PREFIX)/bin/sdl-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-sdl-config' + $(LN_SF) '$(HOST_BINDIR)/sdl-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-sdl-config' '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-sdl.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-sdl.exe' \ `'$(TARGET)-pkg-config' sdl --cflags --libs` endef
--- a/src/sdl_image.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/sdl_image.mk Sun Jun 02 16:59:24 2013 -0400 @@ -31,6 +31,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-sdl_image.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-sdl_image.exe' \ `'$(TARGET)-pkg-config' SDL_image --cflags --libs` endef
--- a/src/sdl_mixer.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/sdl_mixer.mk Sun Jun 02 16:59:24 2013 -0400 @@ -20,7 +20,7 @@ echo \ 'Libs.private:' \ "`$(TARGET)-pkg-config libmodplug --libs`" \ - "`$(HOST_PREFIX)/bin/smpeg-config --libs`" \ + "`$(HOST_BINDIR)/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 \ @@ -45,6 +45,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-sdl_mixer.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-sdl_mixer.exe' \ `'$(TARGET)-pkg-config' SDL_mixer --cflags --libs` endef
--- a/src/sdl_net.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/sdl_net.mk Sun Jun 02 16:59:24 2013 -0400 @@ -27,6 +27,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-sdl_net.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-sdl_net.exe' \ `'$(TARGET)-pkg-config' SDL_net --cflags --libs` endef
--- a/src/sdl_sound.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/sdl_sound.mk Sun Jun 02 16:59:24 2013 -0400 @@ -39,13 +39,13 @@ --disable-physfs \ --disable-altcvt \ CFLAGS='-g -O2 -fno-inline' \ - LIBS="`'$(TARGET)-pkg-config' vorbisfile flac speex --libs` `'$(HOST_PREFIX)/bin/libmikmod-config' --libs`" + LIBS="`'$(TARGET)-pkg-config' vorbisfile flac speex --libs` `'$(HOST_BINDIR)/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 '$(HOST_PREFIX)/bin/test-sdl_sound.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-sdl_sound.exe' \ -lSDL_sound \ `'$(TARGET)-pkg-config' sdl vorbisfile flac speex --cflags --libs` \ - `'$(HOST_PREFIX)/bin/libmikmod-config' --cflags --libs` + `'$(HOST_BINDIR)/libmikmod-config' --cflags --libs` endef
--- a/src/smpeg.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/smpeg.mk Sun Jun 02 16:59:24 2013 -0400 @@ -33,6 +33,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -std=c99 -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-smpeg.exe' \ - `'$(HOST_PREFIX)/bin/smpeg-config' --cflags --libs` + '$(2).c' -o '$(HOST_BINDIR)/test-smpeg.exe' \ + `'$(HOST_BINDIR)/smpeg-config' --cflags --libs` endef
--- a/src/sox.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/sox.mk Sun Jun 02 16:59:24 2013 -0400 @@ -33,6 +33,6 @@ '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(HOST_PREFIX)/bin/test-sox.exe' \ + '$(2).c' -o '$(HOST_BINDIR)/test-sox.exe' \ `'$(TARGET)-pkg-config' sox --cflags --libs` endef
--- a/src/suitesparse.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/suitesparse.mk Sun Jun 02 16:59:24 2013 -0400 @@ -52,7 +52,7 @@ CHOLMOD_CONFIG='-DNPARTITION' # install library files - $(INSTALL) -d '$(MXE_LIBDIR)' + $(INSTALL) -d '$(HOST_LIBDIR)' for f in $(addprefix $(1)/, $($(PKG)_STATICLIBS_1)); do \ if [ $(BUILD_SHARED) = yes ]; then \ @@ -80,23 +80,23 @@ if [ -n "$deplibs" ]; then \ echo " deplibs = $$deplibs"; \ fi; \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CXX)' $$f --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)' $$deplibs; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CXX)' $$f --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)' $$deplibs; \ fi; \ done # install include files - $(INSTALL) -d '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/SuiteSparse_config/'*.h '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/AMD/Include/'*.h '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/BTF/Include/'*.h '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/CAMD/Include/'*.h '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/CCOLAMD/Include/'*.h '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/CHOLMOD/Include/'*.h '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/COLAMD/Include/'*.h '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/CSparse/Include/'*.h '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/CXSparse/Include/'*.h '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/KLU/Include/'*.h '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/LDL/Include/'*.h '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/SPQR/Include/'* '$(MXE_INCDIR)/suitesparse/' - $(INSTALL) -m644 '$(1)/UMFPACK/Include/'*.h '$(MXE_INCDIR)/suitesparse/' + $(INSTALL) -d '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/SuiteSparse_config/'*.h '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/AMD/Include/'*.h '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/BTF/Include/'*.h '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/CAMD/Include/'*.h '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/CCOLAMD/Include/'*.h '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/CHOLMOD/Include/'*.h '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/COLAMD/Include/'*.h '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/CSparse/Include/'*.h '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/CXSparse/Include/'*.h '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/KLU/Include/'*.h '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/LDL/Include/'*.h '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/SPQR/Include/'* '$(HOST_INCDIR)/suitesparse/' + $(INSTALL) -m644 '$(1)/UMFPACK/Include/'*.h '$(HOST_INCDIR)/suitesparse/' endef
--- a/src/termcap.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/termcap.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,6 +25,6 @@ $(MAKE) AR=$(TARGET)-ar -C '$(1)' -j '$(JOBS)' install if [ "$(BUILD_SHARED)" = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(MXE_LIBDIR)/libtermcap.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(HOST_LIBDIR)/libtermcap.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi endef
--- a/src/tiff.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/tiff.mk Sun Jun 02 16:59:24 2013 -0400 @@ -25,6 +25,6 @@ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - rm -f $(MXE_LIBDIR)/libtiff.la - rm -f $(MXE_LIBDIR)/lib/libtiffxx.la + rm -f $(HOST_LIBDIR)/libtiff.la + rm -f $(HOST_LIBDIR)/lib/libtiffxx.la endef
--- a/src/tinyxml.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/tinyxml.mk Sun Jun 02 16:59:24 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 '$(HOST_PREFIX)/lib' - $(INSTALL) -m644 '$(1)'/*.a '$(HOST_PREFIX)/lib/' - $(INSTALL) -d '$(HOST_PREFIX)/include' - $(INSTALL) -m644 '$(1)'/*.h '$(HOST_PREFIX)/include/' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)'/*.a '$(HOST_LIBDIR)' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)'/*.h '$(HOST_INCDIR)' '$(TARGET)-g++' \ -W -Wall -D TIXML_USE_STL -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-tinyxml.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-tinyxml.exe' \ -ltinyxml endef
--- a/src/uuid.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/uuid.mk Sun Jun 02 16:59:24 2013 -0400 @@ -15,8 +15,8 @@ define $(PKG)_BUILD if [ $(BUILD_SHARED) = yes ]; then \ - $(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'; \ + $(INSTALL) -d '$(HOST_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(1)/lib/libuuid.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ + rm -f '$(HOST_LIBDIR)/libuuid.dll.a'; \ fi endef
--- a/src/vigra.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/vigra.mk Sun Jun 02 16:59:24 2013 -0400 @@ -34,7 +34,7 @@ $(MAKE) -C '$(1)/build' -j '$(JOBS)' install $(TARGET)-g++ \ - '$(2).cpp' -o $(HOST_PREFIX)/bin/test-vigra.exe \ + '$(2).cpp' -o $(HOST_BINDIR)/test-vigra.exe \ -DVIGRA_STATIC_LIB \ -lvigraimpex `'$(TARGET)-pkg-config' OpenEXR libtiff-4 libpng --cflags --libs` -ljpeg endef
--- a/src/vmime.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/vmime.mk Sun Jun 02 16:59:24 2013 -0400 @@ -28,11 +28,11 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' install - $(INSTALL) -m644 '$(1)/vmime/config.hpp' '$(HOST_PREFIX)/include/vmime/' + $(INSTALL) -m644 '$(1)/vmime/config.hpp' '$(HOST_INCDIR)/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' '$(HOST_PREFIX)/bin/' + $(INSTALL) -m755 '$(1)/examples/test-vmime.exe' '$(HOST_BINDIR)' endef
--- a/src/winpcap.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/winpcap.mk Sun Jun 02 16:59:24 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 '$(HOST_PREFIX)/include' - $(INSTALL) -m644 '$(1)/Common'/*.h '$(HOST_PREFIX)/include/' - $(INSTALL) -d '$(HOST_PREFIX)/lib' - $(INSTALL) -m644 '$(1)/libpacket.a' '$(HOST_PREFIX)/lib/' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/Common'/*.h '$(HOST_INCDIR)' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/libpacket.a' '$(HOST_LIBDIR)' 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 '$(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/' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/wpcap/libpcap/'*.h '$(1)/wpcap/Win32-Extensions/'*.h '$(HOST_INCDIR)' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/wpcap/PRJ/libwpcap.a' '$(HOST_LIBDIR)' endef
--- a/src/wxwidgets.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/wxwidgets.mk Sun Jun 02 16:59:24 2013 -0400 @@ -58,7 +58,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 '$(HOST_PREFIX)/bin/wx-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wx-config' + $(INSTALL) -m755 '$(HOST_BINDIR)/wx-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wx-config' # build the wxWidgets variant without unicode support cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets) @@ -107,18 +107,18 @@ # backup of the unicode wx-config script # such that "make install" won't overwrite it - mv '$(HOST_PREFIX)/bin/wx-config' '$(HOST_PREFIX)/bin/wx-config-backup' + mv '$(HOST_BINDIR)/wx-config' '$(HOST_BINDIR)/wx-config-backup' $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= - 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' + mv '$(HOST_BINDIR)/wx-config' '$(HOST_BINDIR)/wx-config-nounicode' + $(INSTALL) -m755 '$(HOST_BINDIR)/wx-config-nounicode' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wx-config-nounicode' # restore the unicode wx-config script - mv '$(HOST_PREFIX)/bin/wx-config-backup' '$(HOST_PREFIX)/bin/wx-config' + mv '$(HOST_BINDIR)/wx-config-backup' '$(HOST_BINDIR)/wx-config' # build test program '$(TARGET)-g++' \ -W -Wall -Werror -pedantic -std=gnu++0x \ - '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-wxwidgets.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-wxwidgets.exe' \ `'$(TARGET)-wx-config' --cflags --libs` endef
--- a/src/xerces.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/xerces.mk Sun Jun 02 16:59:24 2013 -0400 @@ -47,6 +47,6 @@ '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-xerces.exe' \ + '$(2).cpp' -o '$(HOST_BINDIR)/test-xerces.exe' \ `'$(TARGET)-pkg-config' xerces-c --cflags --libs` endef
--- a/src/xvidcore.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/xvidcore.mk Sun Jun 02 16:59:24 2013 -0400 @@ -21,9 +21,9 @@ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' BUILD_DIR='build' SHARED_LIB= - $(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' + $(INSTALL) -d '$(HOST_INCDIR)' + $(INSTALL) -m644 '$(1)/../../src/xvid.h' '$(HOST_INCDIR)' + $(INSTALL) -d '$(HOST_LIBDIR)' + $(INSTALL) -m644 '$(1)/build/xvidcore.a' '$(HOST_LIBDIR)' + $(LN_SF) '$(HOST_LIBDIR)/xvidcore.a' '$(HOST_LIBDIR)/libxvidcore.a' endef
--- a/src/zlib.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/zlib.mk Sun Jun 02 16:59:24 2013 -0400 @@ -32,7 +32,7 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' install if [ "$(BUILD_SHARED)" = yes ]; then \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/libz.a' --install '$(INSTALL)' --libdir '$(MXE_LIBDIR)' --bindir '$(MXE_BINDIR)'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_CC)' '$(1)/libz.a' --install '$(INSTALL)' --libdir '$(HOST_LIBDIR)' --bindir '$(HOST_BINDIR)'; \ fi endef endif