From 3653eb6ec1ba0f178e4ab39d7e9b72acb36298e9 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 2 Jun 2013 08:52:23 +0200 Subject: use --libdir to avoid //lib64 confusion (more) follow-up to commit 593ab5a7068d6142903ab839237100e92a5071f3 --- src/dbus.mk | 1 + src/expat.mk | 3 ++- src/fontconfig.mk | 1 + src/freetds.mk | 1 + src/freetype.mk | 3 ++- src/gsoap.mk | 1 + src/icu4c.mk | 1 + src/jpeg.mk | 1 + src/lcms1.mk | 1 + src/libodbc++.mk | 1 + src/libpng.mk | 3 ++- src/postgresql.mk | 1 + src/sqlite.mk | 1 + src/tiff.mk | 1 + src/xz.mk | 1 + 15 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/dbus.mk b/src/dbus.mk index 0e8ac35..63bfab6 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -21,6 +21,7 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --with-xml=expat \ --disable-tests \ --disable-verbose-mode \ diff --git a/src/expat.mk b/src/expat.mk index c006013..03393b7 100644 --- a/src/expat.mk +++ b/src/expat.mk @@ -19,6 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff --git a/src/fontconfig.mk b/src/fontconfig.mk index ca1ca94..ad3b33b 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -22,6 +22,7 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --with-arch='$(TARGET)' \ --with-expat='$(PREFIX)/$(TARGET)' \ --disable-docs diff --git a/src/freetds.mk b/src/freetds.mk index 6010cef..911ffe6 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -24,6 +24,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --host='$(TARGET)' \ --build="`config.guess`" \ --disable-rpath \ diff --git a/src/freetype.mk b/src/freetype.mk index b02ee50..2b77dfd 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -20,7 +20,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)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/gsoap.mk b/src/gsoap.mk index 3ca54b7..8ee8cd2 100644 --- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -40,6 +40,7 @@ define $(PKG)_BUILD # http://groups.google.com/group/ikarus-users/browse_thread/thread/fd1d101eac32633f cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)\lib' \ --host='$(TARGET)' \ --build="`config.guess`" \ --enable-gnutls \ diff --git a/src/icu4c.mk b/src/icu4c.mk index 81bbc1d..5bcc0a1 100644 --- a/src/icu4c.mk +++ b/src/icu4c.mk @@ -23,6 +23,7 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --enable-static \ --disable-shared \ --with-cross-build='$(1).native' \ diff --git a/src/jpeg.mk b/src/jpeg.mk index cd9e33d..244b7ba 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -18,6 +18,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --host='$(TARGET)' \ --disable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= diff --git a/src/lcms1.mk b/src/lcms1.mk index 0ba84ed..38e1b5d 100644 --- a/src/lcms1.mk +++ b/src/lcms1.mk @@ -19,6 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ diff --git a/src/libodbc++.mk b/src/libodbc++.mk index 4fb729e..0f4acff 100644 --- a/src/libodbc++.mk +++ b/src/libodbc++.mk @@ -23,6 +23,7 @@ define $(PKG)_BUILD touch '$(1)/config.h.in' cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --host='$(TARGET)' \ --disable-shared \ --without-tests \ diff --git a/src/libpng.mk b/src/libpng.mk index db45f80..21fc46b 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -25,7 +25,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)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ diff --git a/src/postgresql.mk b/src/postgresql.mk index 6434f2f..6b4824e 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -24,6 +24,7 @@ define $(PKG)_BUILD # Since we build only client libary, use bogus tzdata to satisfy configure. cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --host='$(TARGET)' \ --build="`config.guess`" \ --disable-shared \ diff --git a/src/sqlite.mk b/src/sqlite.mk index fced0e7..a5957a1 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -21,6 +21,7 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-readline \ --disable-threadsafe $(MAKE) -C '$(1)' -j '$(JOBS)' install diff --git a/src/tiff.mk b/src/tiff.mk index d7a3d25..ed34906 100644 --- a/src/tiff.mk +++ b/src/tiff.mk @@ -22,6 +22,7 @@ define $(PKG)_BUILD --build="`config.guess`" \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --without-x $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff --git a/src/xz.mk b/src/xz.mk index 7cfc628..176686d 100644 --- a/src/xz.mk +++ b/src/xz.mk @@ -20,6 +20,7 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ + --libdir='$(PREFIX)/$(TARGET)/lib' \ --disable-shared \ --disable-threads \ --disable-nls -- cgit v0.12