From 11a51134c055488d57cfd3fc5c5e424d20bd39b3 Mon Sep 17 00:00:00 2001
From: mazze <mazze@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Wed, 6 Apr 2016 21:50:54 +0000
Subject: [PATCH] Added "libdir=$(AROS_LIB)" to extraoptions to prevent
 creating the libs in lib64 directory.

git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@52543 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 MultiMedia/libs/theora/mmakefile.src   | 2 +-
 development/libs/curl/mmakefile.src    | 2 +-
 development/libs/icu/mmakefile.src     | 3 ++-
 development/libs/libxslt/mmakefile.src | 2 +-
 gnu/binutils/mmakefile.src             | 1 +
 gnu/bison/mmakefile.src                | 3 ++-
 gnu/gcc/mmakefile.src                  | 1 +
 gnu/gmp/mmakefile.src                  | 3 ++-
 gnu/mpc/mmakefile.src                  | 3 ++-
 gnu/mpfr/mmakefile.src                 | 3 ++-
 pack/lzo/mmakefile.src                 | 3 ++-
 11 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/MultiMedia/libs/theora/mmakefile.src b/MultiMedia/libs/theora/mmakefile.src
index b0afaf85b..b74b2e4eb 100644
--- a/MultiMedia/libs/theora/mmakefile.src
+++ b/MultiMedia/libs/theora/mmakefile.src
@@ -9,5 +9,5 @@ include $(SRCDIR)/config/aros.cfg
 
 %fetch_and_build_gnu_development package=libtheora version=1.1.1 patch=yes \
     package_repo=http://downloads.xiph.org/releases/theora/ suffixes="tar.gz" \
-    extraoptions="--disable-examples"
+    extraoptions="--disable-examples --libdir=$(AROS_LIB)"
 
diff --git a/development/libs/curl/mmakefile.src b/development/libs/curl/mmakefile.src
index 7f86880a6..f58dc68d9 100644
--- a/development/libs/curl/mmakefile.src
+++ b/development/libs/curl/mmakefile.src
@@ -10,7 +10,7 @@ REPOSITORIES := http://curl.haxx.se/download \
 
 %fetch_and_build_gnu_development package=curl version=7.37.1 \
     patch=yes package_repo="$(REPOSITORIES)" \
-    extraoptions="--without-random --disable-ntlm-wb CPPFLAGS='-D__BSD_VISIBLE=1'" \
+    extraoptions="--without-random --disable-ntlm-wb CPPFLAGS='-D__BSD_VISIBLE=1' --libdir=$(AROS_LIB)" \
     postconfigure="development-curl-fixconfig"
 
 #MM
diff --git a/development/libs/icu/mmakefile.src b/development/libs/icu/mmakefile.src
index 731703de2..3d91e3303 100644
--- a/development/libs/icu/mmakefile.src
+++ b/development/libs/icu/mmakefile.src
@@ -24,7 +24,8 @@ ICU_EXTRA_OPTS := \
         --enable-threads=no \
         --with-data-packaging=static \
         --host=$(AROS_TARGET_CPU)-aros \
-        --with-cross-build=$(CROSSTOOLSDIR)/tools/crosstools/$(ICU_PKGNAME)
+        --with-cross-build=$(CROSSTOOLSDIR)/tools/crosstools/$(ICU_PKGNAME) \
+        --libdir=$(AROS_LIB)
 
 %fetch_and_build mmake=contrib-icu4c-complete package=$(ICU_PKGNAME) version=$(ICU_PKGVERSION)-src \
 	package_repo="$(ICU_REPOSITORY)" suffixes="tgz" \
diff --git a/development/libs/libxslt/mmakefile.src b/development/libs/libxslt/mmakefile.src
index d8a53bc54..b6fd81c5e 100644
--- a/development/libs/libxslt/mmakefile.src
+++ b/development/libs/libxslt/mmakefile.src
@@ -5,5 +5,5 @@ include $(SRCDIR)/config/aros.cfg
 
 %fetch_and_build_gnu_development package=libxslt version=1.1.24 \
     patch="yes" suffixes="tar.gz" package_repo="http://xmlsoft.org/sources" \
-    extraoptions="--without-crypto --without-plugins --with-libxml-prefix=$(AROS_DEVELOPMENT) --with-libxml-include-prefix=$(AROS_INCLUDES)/libxml2 --with-libxml-libs-prefix=$(AROS_DEVELOPMENT)/lib --without-python"
+    extraoptions="--without-crypto --without-plugins --with-libxml-prefix=$(AROS_DEVELOPMENT) --with-libxml-include-prefix=$(AROS_INCLUDES)/libxml2 --with-libxml-libs-prefix=$(AROS_DEVELOPMENT)/lib --without-python --libdir=$(AROS_LIB)"
 
diff --git a/gnu/binutils/mmakefile.src b/gnu/binutils/mmakefile.src
index 2fbcc58ab..9721dd5c0 100644
--- a/gnu/binutils/mmakefile.src
+++ b/gnu/binutils/mmakefile.src
@@ -11,6 +11,7 @@ BINUTILS_VERSION     = $(TARGET_BINUTILS_VER)
 
 BINUTILS_EXTRAOPTS := --with-sysroot=/Development
 BINUTILS_EXTRAOPTS += --with-build-sysroot=$(AROS_DEVELOPMENT)
+BINUTILS_EXTRAOPTS += --libdir=$(AROS_LIB)
 
 %fetch_and_build_gnu_development package=binutils version=$(BINUTILS_VERSION) patch=yes \
     extraoptions=$(BINUTILS_EXTRAOPTS)
diff --git a/gnu/bison/mmakefile.src b/gnu/bison/mmakefile.src
index b54642c22..82553a8c0 100644
--- a/gnu/bison/mmakefile.src
+++ b/gnu/bison/mmakefile.src
@@ -6,4 +6,5 @@ include $(SRCDIR)/config/aros.cfg
 #MM- contrib-gnu : contrib-gnu-bison
 #MM- contrib-gnu-bison : development-bison
 
-%fetch_and_build_gnu_development package=bison version=1.875 patch=yes
+%fetch_and_build_gnu_development package=bison version=1.875 patch=yes \
+    extraoptions="--libdir=$(AROS_LIB)"
diff --git a/gnu/gcc/mmakefile.src b/gnu/gcc/mmakefile.src
index 19f90cd92..09e359113 100644
--- a/gnu/gcc/mmakefile.src
+++ b/gnu/gcc/mmakefile.src
@@ -41,6 +41,7 @@ GCC_EXTRA_OPTS += --with-dwarf2
 GCC_EXTRA_OPTS += --enable-frame-pointer
 GCC_EXTRA_OPTS += --disable-libssp
 GCC_EXTRA_OPTS += --disable-libstdcxx-pch
+GCC_EXTRA_OPTS += --libdir=$(AROS_LIB)
 
 %fetch_and_build_gnu_development package=gcc version=$(GCC_VERSION) patch=yes \
     package_repo="$(GNU_REPOSITORY)/gcc/gcc-$(GCC_VERSION)" \
diff --git a/gnu/gmp/mmakefile.src b/gnu/gmp/mmakefile.src
index a94fef940..c465908ce 100644
--- a/gnu/gmp/mmakefile.src
+++ b/gnu/gmp/mmakefile.src
@@ -5,6 +5,7 @@ include $(SRCDIR)/config/aros.cfg
 
 #MM- contrib-gnu-gmp : development-gmp
 
-%fetch_and_build_gnu_development package=gmp version=5.1.2 patch=yes
+%fetch_and_build_gnu_development package=gmp version=5.1.2 patch=yes \
+    extraoptions="--libdir=$(AROS_LIB)"
 
 %common
diff --git a/gnu/mpc/mmakefile.src b/gnu/mpc/mmakefile.src
index e9a63a74a..c1c862a75 100644
--- a/gnu/mpc/mmakefile.src
+++ b/gnu/mpc/mmakefile.src
@@ -6,6 +6,7 @@ include $(SRCDIR)/config/aros.cfg
 #MM- contrib-gnu-mpc : development-mpc
 #MM- development-mpc : development-mpfr
 
-%fetch_and_build_gnu_development package=mpc version=1.0.3 patch=no
+%fetch_and_build_gnu_development package=mpc version=1.0.3 patch=no \
+    extraoptions="--libdir=$(AROS_LIB)"
 
 %common
diff --git a/gnu/mpfr/mmakefile.src b/gnu/mpfr/mmakefile.src
index e4a4015bb..b4f0a4bd3 100644
--- a/gnu/mpfr/mmakefile.src
+++ b/gnu/mpfr/mmakefile.src
@@ -6,6 +6,7 @@ include $(SRCDIR)/config/aros.cfg
 #MM- contrib-gnu-mpfr : development-mpfr
 #MM- development-mpfr : development-gmp
 
-%fetch_and_build_gnu_development package=mpfr version=3.1.2 patch=no
+%fetch_and_build_gnu_development package=mpfr version=3.1.2 patch=no \
+    extraoptions="--libdir=$(AROS_LIB)"
 
 %common
diff --git a/pack/lzo/mmakefile.src b/pack/lzo/mmakefile.src
index 23acf1e41..4c2c18714 100644
--- a/pack/lzo/mmakefile.src
+++ b/pack/lzo/mmakefile.src
@@ -9,4 +9,5 @@ include $(SRCDIR)/config/aros.cfg
 REPOSITORIES := http://www.oberhumer.com/opensource/lzo/download
 
 %fetch_and_build_gnu_development package=lzo version=2.09 patch=no \
-    package_repo=$(REPOSITORIES) suffixes="tar.gz"
+    package_repo=$(REPOSITORIES) suffixes="tar.gz" \
+    extraoptions="--libdir=$(AROS_LIB)"
-- 
2.11.4.GIT