30 files changed, 10 insertions, 7 deletions

diff --git a/configure.ac b/configure.ac
index ccf8da71..5f08d2d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,7 @@ case "$host" in
     AC_DEFINE(ARCH_UNKNOWN, 1, [architecture is unknown])
     ;;
 esac
+AC_SUBST(LIB)
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 
diff --git a/lib-x86-32/lib/libpng15.a b/lib-x86-32/lib/libpng.a
index ce09367f..ce09367f 100644
--- a/lib-x86-32/lib/libpng15.a
+++ b/lib-x86-32/lib/libpng.a
diff --git a/lib-x86-64/lib/libFLAC.a b/lib-x86-64/lib/libFLAC.a
index 86b7e265..a23bef27 100644
--- a/lib-x86-64/lib/libFLAC.a
+++ b/lib-x86-64/lib/libFLAC.a
diff --git a/lib-x86-64/lib/libcddb.a b/lib-x86-64/lib/libcddb.a
index d8026de1..740a8a98 100644
--- a/lib-x86-64/lib/libcddb.a
+++ b/lib-x86-64/lib/libcddb.a
diff --git a/lib-x86-64/lib/libcdio.a b/lib-x86-64/lib/libcdio.a
index 0285f75e..365d59a4 100644
--- a/lib-x86-64/lib/libcdio.a
+++ b/lib-x86-64/lib/libcdio.a
diff --git a/lib-x86-64/lib/libcurl.a b/lib-x86-64/lib/libcurl.a
index e81f56d5..f3f9b1a0 100644
--- a/lib-x86-64/lib/libcurl.a
+++ b/lib-x86-64/lib/libcurl.a
diff --git a/lib-x86-64/lib/libdbus-1.a b/lib-x86-64/lib/libdbus-1.a
index ed67497d..53594ffb 100644
--- a/lib-x86-64/lib/libdbus-1.a
+++ b/lib-x86-64/lib/libdbus-1.a
diff --git a/lib-x86-64/lib/libexpat.a b/lib-x86-64/lib/libexpat.a
index fdc51352..918f08a8 100644
--- a/lib-x86-64/lib/libexpat.a
+++ b/lib-x86-64/lib/libexpat.a
diff --git a/lib-x86-64/lib/libfaad.a b/lib-x86-64/lib/libfaad.a
index d4fa87c9..d9f525c6 100644
--- a/lib-x86-64/lib/libfaad.a
+++ b/lib-x86-64/lib/libfaad.a
diff --git a/lib-x86-64/lib/libiso9660.a b/lib-x86-64/lib/libiso9660.a
index 445af6c3..177895e5 100644
--- a/lib-x86-64/lib/libiso9660.a
+++ b/lib-x86-64/lib/libiso9660.a
diff --git a/lib-x86-64/lib/libjpeg.a b/lib-x86-64/lib/libjpeg.a
index 6cb1c4ac..696510c2 100644
--- a/lib-x86-64/lib/libjpeg.a
+++ b/lib-x86-64/lib/libjpeg.a
diff --git a/lib-x86-64/lib/libmad.a b/lib-x86-64/lib/libmad.a
index 92e07d8d..7fad3234 100644
--- a/lib-x86-64/lib/libmad.a
+++ b/lib-x86-64/lib/libmad.a
diff --git a/lib-x86-64/lib/libmp4ff.a b/lib-x86-64/lib/libmp4ff.a
index 880a10af..d5c379aa 100644
--- a/lib-x86-64/lib/libmp4ff.a
+++ b/lib-x86-64/lib/libmp4ff.a
diff --git a/lib-x86-64/lib/libogg.a b/lib-x86-64/lib/libogg.a
index 4628196d..0e37488f 100644
--- a/lib-x86-64/lib/libogg.a
+++ b/lib-x86-64/lib/libogg.a
diff --git a/lib-x86-64/lib/libopencore-amrnb.a b/lib-x86-64/lib/libopencore-amrnb.a
index 3d640837..3e7e0a46 100644
--- a/lib-x86-64/lib/libopencore-amrnb.a
+++ b/lib-x86-64/lib/libopencore-amrnb.a
diff --git a/lib-x86-64/lib/libopencore-amrwb.a b/lib-x86-64/lib/libopencore-amrwb.a
index da37726c..c1ec70db 100644
--- a/lib-x86-64/lib/libopencore-amrwb.a
+++ b/lib-x86-64/lib/libopencore-amrwb.a
diff --git a/lib-x86-64/lib/libpng15.a b/lib-x86-64/lib/libpng15.a
index 864a0aa8..2e464207 100644
--- a/lib-x86-64/lib/libpng15.a
+++ b/lib-x86-64/lib/libpng15.a
diff --git a/lib-x86-64/lib/libsamplerate.a b/lib-x86-64/lib/libsamplerate.a
index daac1cec..1a62ec38 100644
--- a/lib-x86-64/lib/libsamplerate.a
+++ b/lib-x86-64/lib/libsamplerate.a
diff --git a/lib-x86-64/lib/libsndfile.a b/lib-x86-64/lib/libsndfile.a
index 8a460e7b..49e1b19d 100644
--- a/lib-x86-64/lib/libsndfile.a
+++ b/lib-x86-64/lib/libsndfile.a
diff --git a/lib-x86-64/lib/libudf.a b/lib-x86-64/lib/libudf.a
index 31c3333e..9a5e4e83 100644
--- a/lib-x86-64/lib/libudf.a
+++ b/lib-x86-64/lib/libudf.a
diff --git a/lib-x86-64/lib/libvorbis.a b/lib-x86-64/lib/libvorbis.a
index 64738749..88db54bf 100644
--- a/lib-x86-64/lib/libvorbis.a
+++ b/lib-x86-64/lib/libvorbis.a
diff --git a/lib-x86-64/lib/libvorbisenc.a b/lib-x86-64/lib/libvorbisenc.a
index 12d8b9a7..a03a0059 100644
--- a/lib-x86-64/lib/libvorbisenc.a
+++ b/lib-x86-64/lib/libvorbisenc.a
diff --git a/lib-x86-64/lib/libvorbisfile.a b/lib-x86-64/lib/libvorbisfile.a
index a901a9de..98d8bcf4 100644
--- a/lib-x86-64/lib/libvorbisfile.a
+++ b/lib-x86-64/lib/libvorbisfile.a
diff --git a/lib-x86-64/lib/libwavpack.a b/lib-x86-64/lib/libwavpack.a
index 35519fdd..cf99b632 100644
--- a/lib-x86-64/lib/libwavpack.a
+++ b/lib-x86-64/lib/libwavpack.a
diff --git a/lib-x86-64/lib/libz.a b/lib-x86-64/lib/libz.a
index 8603b0ae..9267fde3 100644
--- a/lib-x86-64/lib/libz.a
+++ b/lib-x86-64/lib/libz.a
diff --git a/lib-x86-64/lib/libzip.a b/lib-x86-64/lib/libzip.a
index ea9e827f..f5201de5 100644
--- a/lib-x86-64/lib/libzip.a
+++ b/lib-x86-64/lib/libzip.a
diff --git a/plugins/converter/Makefile.am b/plugins/converter/Makefile.am
index 507a18f0..5bab060c 100644
--- a/plugins/converter/Makefile.am
+++ b/plugins/converter/Makefile.am
@@ -31,7 +31,7 @@ converter_gtkui_la_CFLAGS = -std=c99 $(GTKUI_DEPS_CFLAGS)
 
 # fallback lib
 if STATICLINK
-GTK_ROOT=../../../deadbeef-deps/gtk-debian/usr
+GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
 converter_gtkui_fallback_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
 converter_gtkui_fallback_la_LDFLAGS = -module
 
diff --git a/plugins/mpgmad/Makefile.am b/plugins/mpgmad/Makefile.am
index aae7fa37..4cd3b67f 100644
--- a/plugins/mpgmad/Makefile.am
+++ b/plugins/mpgmad/Makefile.am
@@ -5,5 +5,5 @@ mpgmad_la_SOURCES = mpgmad.c
 mpgmad_la_LDFLAGS = -module
 
 mpgmad_la_LIBADD = $(LDADD) $(MAD_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99
+AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
 endif
diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh
index fc6c5a5f..36f2665e 100755
--- a/scripts/portable_build.sh
+++ b/scripts/portable_build.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
 ORIGIN=`pwd | perl -ne 'chomp and print'`
+AP=$HOME/bin/autopackage
+export CC=$AP/apbuild/apgcc
+export CXX=$AP/apbuild/apgcc 
 export APBUILD_STATIC_LIBGCC=1
 
 ./autogen.sh
-export CC=$ORIGIN/tools/apbuild/apgcc
-export CXX=$ORIGIN/tools/apbuild/apgcc
 
 ./configure --enable-staticlink --enable-portable --disable-artwork-imlib2
 sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool
diff --git a/scripts/portable_extraplugs.sh b/scripts/portable_extraplugs.sh
index 5d922aad..2c6868a6 100755
--- a/scripts/portable_extraplugs.sh
+++ b/scripts/portable_extraplugs.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
 ORIGIN=`pwd | perl -ne 'chomp and print'`
+AP=$HOME/bin/autopackage
+export CC=$AP/apbuild/apgcc
+export CXX=$AP/apbuild/apgcc 
 export APBUILD_STATIC_LIBGCC=1
-export CC=$ORIGIN/tools/apbuild/apgcc
-export CXX=$ORIGIN/tools/apbuild/apgcc
 
-ZLIB_LIBS="$ORIGIN/lib-x86-32/libz.a"
+ZLIB_LIBS="$ORIGIN/lib-x86-32/lib/libz.a"
 CFLAGS="-I$ORIGIN/lib-x86-32/include"
 
 for i in shn dumb ao ; do