diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2013-06-01 22:55:00 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2013-06-01 23:43:53 (GMT) |
| commit | 593ab5a7068d6142903ab839237100e92a5071f3 (patch) | |
| tree | 0862b81247dec28a77327a1a57dc5fa895451efb | |
| parent | f7133cc22b3b704d3dd18c67c8f15447bdb8f1e9 (diff) | |
| download | mxe-593ab5a7068d6142903ab839237100e92a5071f3.zip mxe-593ab5a7068d6142903ab839237100e92a5071f3.tar.gz mxe-593ab5a7068d6142903ab839237100e92a5071f3.tar.bz2 | |
use --libdir to avoid <prefix>/<target>/lib64 confusion
| -rw-r--r-- | src/gettext.mk | 1 | ||||
| -rw-r--r-- | src/gmp.mk | 1 | ||||
| -rw-r--r-- | src/gnutls.mk | 1 | ||||
| -rw-r--r-- | src/libgcrypt.mk | 1 | ||||
| -rw-r--r-- | src/libgpg_error.mk | 1 | ||||
| -rw-r--r-- | src/libgsasl.mk | 1 | ||||
| -rw-r--r-- | src/libiconv.mk | 1 | ||||
| -rw-r--r-- | src/libidn.mk | 1 | ||||
| -rw-r--r-- | src/libntlm.mk | 3 | ||||
| -rw-r--r-- | src/nettle.mk | 3 | ||||
| -rw-r--r-- | src/pcre.mk | 1 | ||||
| -rw-r--r-- | src/winpthreads.mk | 1 |
12 files changed, 14 insertions, 2 deletions
diff --git a/src/gettext.mk b/src/gettext.mk index 0183cd1..7488068 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -21,6 +21,7 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --enable-threads=win32 \ --without-libexpat-prefix \ --without-libxml2-prefix \ @@ -23,6 +23,7 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-shared \ --enable-cxx \ --without-readline diff --git a/src/gnutls.mk b/src/gnutls.mk index 1dfa8b9..ef5ab08 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -30,6 +30,7 @@ define $(PKG)_BUILD --enable-static \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-rpath \ --disable-nls \ --disable-guile \ diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index 0ef9254..5c12611 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -22,6 +22,7 @@ define $(PKG)_CONFIGURE --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --with-gpg-error-prefix='$(PREFIX)/$(TARGET)' endef diff --git a/src/libgpg_error.mk b/src/libgpg_error.mk index f18ad33..36565d4 100644 --- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -21,6 +21,7 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-nls \ --disable-languages $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/libgsasl.mk b/src/libgsasl.mk index e2f62a9..477fea6 100644 --- a/src/libgsasl.mk +++ b/src/libgsasl.mk @@ -22,6 +22,7 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-nls \ --with-libgcrypt \ --with-libiconv-prefix='$(PREFIX)/$(TARGET)' \ diff --git a/src/libiconv.mk b/src/libiconv.mk index b4393d0..f5d1b03 100644 --- a/src/libiconv.mk +++ b/src/libiconv.mk @@ -21,6 +21,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-shared \ --disable-nls $(MAKE) -C '$(1)/libcharset' -j '$(JOBS)' install diff --git a/src/libidn.mk b/src/libidn.mk index 6e0734a..9806a06 100644 --- a/src/libidn.mk +++ b/src/libidn.mk @@ -23,6 +23,7 @@ define $(PKG)_BUILD --disable-shared \ --disable-csharp \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --with-libiconv-prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/libntlm.mk b/src/libntlm.mk index daa167a..0ebbdc4 100644 --- a/src/libntlm.mk +++ b/src/libntlm.mk @@ -21,6 +21,7 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff --git a/src/nettle.mk b/src/nettle.mk index d031dae..7bd81a8 100644 --- a/src/nettle.mk +++ b/src/nettle.mk @@ -22,7 +22,8 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o $(MAKE) -C '$(1)' -j '$(JOBS)' install endef diff --git a/src/pcre.mk b/src/pcre.mk index 1839988..1b56113 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -24,6 +24,7 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --enable-pcre16 \ --enable-utf \ --enable-unicode-properties \ diff --git a/src/winpthreads.mk b/src/winpthreads.mk index ba2d132..01fb348 100644 --- a/src/winpthreads.mk +++ b/src/winpthreads.mk @@ -17,6 +17,7 @@ define $(PKG)_BUILD_mingw-w64 cd '$(1)/mingw-w64-libraries/winpthreads' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' --enable-static \ --disable-shared $(MAKE) -C '$(1)/mingw-w64-libraries/winpthreads' -j '$(JOBS)' install |