--- Makefile.fix-makefile	2013-07-03 14:43:41.000000000 +0300
+++ Makefile	2015-01-07 17:09:43.031636926 +0200
@@ -1,18 +1,18 @@
 
 #Customisable stuff here
-LINUX32_COMPILER = i686-pc-linux-gnu-gcc
-LINUX64_COMPILER = x86_64-pc-linux-gnu-gcc
+LINUX_COMPILER ?= gcc
 WIN32_COMPILER = /usr/bin/i586-mingw32-gcc
 LINUX_ARM_COMPILER = arm-none-linux-gnueabi-gcc
+LINUX_LIBDIR ?= /usr/lib
 
 LIBPURPLE_CFLAGS = -I/usr/include/libpurple -DPURPLE_PLUGINS -DENABLE_NLS
-GLIB_CFLAGS = `pkg-config --cflags glib-2.0` -I/usr/include
-DBUS_CFLAGS = -DSKYPE_DBUS `pkg-config --cflags dbus-1`
+GLIB_CFLAGS = -I/usr/include/glib-2.0 -I${LINUX_LIBDIR}/glib-2.0/include -I/usr/include
+DBUS_CFLAGS = -DSKYPE_DBUS -I/usr/include/dbus-1.0 -I${LINUX_LIBDIR}/dbus-1.0/include
 WIN32_DEV_DIR = /root/pidgin/win32-dev
 WIN32_PIDGIN_DIR = /root/pidgin/pidgin-2.6.1
 WIN32_CFLAGS = -DPURPLE_PLUGINS -DENABLE_NLS -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_PIDGIN_DIR}/libpurple/win32 -I${WIN32_PIDGIN_DIR}/libpurple -I${WIN32_DEV_DIR}/gtk_2_0/include -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_DEV_DIR}/gtk_2_0/lib/glib-2.0/include
 WIN32_LIBS = -L${WIN32_DEV_DIR}/gtk_2_0/lib -L${WIN32_PIDGIN_DIR}/libpurple -lglib-2.0 -lgobject-2.0 -lgthread-2.0 -lintl -lpurple
-XUL_LIBS = -I/usr/lib/xulrunner/include xpcomModule.cpp -I/usr/include/nspr
+XUL_LIBS = -I${LINUX_LIBDIR}/xulrunner/include xpcomModule.cpp -I/usr/include/nspr
 X11_LIBS = `pkg-config --libs x11`
 
 VV_CFLAGS = -I/usr/include/gstreamer-0.10 -DUSE_VV -I/usr/include/libxml2
@@ -31,8 +31,8 @@
 
 #By default, 'make' compiles X11 and DBus versions on local platform
 all: .DEPENDS skype_messaging_x11.c skype_messaging_dbus.c
-	gcc ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -pipe libskype.c -o libskype.so -shared -fPIC -DPIC ${X11_LIBS}
-	gcc ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -pipe libskype.c -o libskype_dbus.so -shared -fPIC -DPIC ${DBUS_CFLAGS}
+	${LINUX_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -pipe libskype.c -o libskype.so -shared -fPIC -DPIC ${X11_LIBS}
+	${LINUX_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -pipe libskype.c -o libskype_dbus.so -shared -fPIC -DPIC ${DBUS_CFLAGS}
 
 install: locales
 	mkdir -p $(DESTDIR)/usr/share/pixmaps/pidgin/emotes/skype
@@ -40,12 +40,12 @@
 	mkdir -p $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/16
 	mkdir -p $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22
 	mkdir -p $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48
-	mkdir -p $(DESTDIR)/usr/lib/purple-2
+	mkdir -p $(DESTDIR)${LINUX_LIBDIR}/purple-2
 	install -m 664 theme $(DESTDIR)/usr/share/pixmaps/pidgin/emotes/skype/
 	install -m 664 icons/16/skypeout.png icons/16/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/16
 	install -m 664 icons/22/skypeout.png icons/22/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22
 	install -m 664 icons/48/skypeout.png icons/48/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48
-	install -m 664 libskype_dbus.so libskype.so $(DESTDIR)/usr/lib/purple-2/
+	install -m 664 libskype_dbus.so libskype.so $(DESTDIR)${LINUX_LIBDIR}/purple-2/
 
 uninstall:
 	rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/emotes/skype
@@ -55,32 +55,32 @@
 	rm -rf  $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22/skype.png
 	rm -rf  $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48/skypeout.png
 	rm -rf  $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48/skype.png
-	rm -rf $(DESTDIR)/usr/lib/purple-2/libskype.so
-	rm -rf $(DESTDIR)/usr/lib/purple-2/libskype_dbus.so
+	rm -rf $(DESTDIR)${LINUX_LIBDIR}/purple-2/libskype.so
+	rm -rf $(DESTDIR)${LINUX_LIBDIR}/purple-2/libskype_dbus.so
 
 clean:
 	rm -f libskype.so libskype64.so libskype_dbus.so libskype_dbus64.so libskypearm.so libskype.dll skype4pidgin.deb skype4pidgin-installer.exe po/*.mo
 
 libskypenet.so:  .DEPENDS skype_messaging_network.c
-	${LINUX32_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -march=athlon-xp -O2 -pipe libskype.c -o libskypenet.so -shared -fPIC -DPIC -DSKYPENET
+	${LINUX_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -O2 -pipe libskype.c -o libskypenet.so -shared -fPIC -DPIC -DSKYPENET
 
 libskype.so: .DEPENDS skype_messaging_x11.c
-	${LINUX32_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -march=athlon-xp -pipe libskype.c -o libskype.so -shared -fPIC -DPIC
+	${LINUX_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -pipe libskype.c -o libskype.so -shared -fPIC -DPIC
 
 libskype64.so: .DEPENDS skype_messaging_x11.c
-	${LINUX64_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -m32 -m64 -O2 -pipe libskype.c -o libskype64.so -shared -fPIC -DPIC -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
+	${LINUX_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -m64 -O2 -pipe libskype.c -o libskype64.so -shared -fPIC -DPIC -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
 
 libskypenet64.so: .DEPENDS skype_messaging_network.c
-	${LINUX64_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -m32 -m64 -O2 -pipe libskype.c -o libskypenet64.so -shared -fPIC -DPIC -DSKYPENET -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
+	${LINUX_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -m64 -O2 -pipe libskype.c -o libskypenet64.so -shared -fPIC -DPIC -DSKYPENET -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
 
 libskypearm.so: .DEPENDS skype_messaging_x11.c
 	${LINUX_ARM_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -O2 -pipe libskype.c -o libskypearm.so -shared -fPIC -DPIC
 
 libskype_dbus.so: .DEPENDS skype_messaging_dbus.c
-	${LINUX32_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -march=athlon-xp -pipe libskype.c -o libskype_dbus.so -shared -fPIC -DPIC ${DBUS_CFLAGS}
+	${LINUX_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -pipe libskype.c -o libskype_dbus.so -shared -fPIC -DPIC ${DBUS_CFLAGS}
 
 libskype_dbus64.so: .DEPENDS skype_messaging_dbus.c
-	${LINUX64_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -m64 -pipe libskype.c -o libskype_dbus64.so -shared -fPIC -DPIC ${DBUS_CFLAGS} -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
+	${LINUX_COMPILER} ${LIBPURPLE_CFLAGS} -Wall -pthread ${GLIB_CFLAGS} -I. -g -m64 -pipe libskype.c -o libskype_dbus64.so -shared -fPIC -DPIC ${DBUS_CFLAGS} -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
 
 libskype.dll: .DEPENDS skype_messaging_win32.c
 	${WIN32_COMPILER} -Wall -I. -g -O2 -pipe libskype.c -o libskype.dll -shared -mno-cygwin ${WIN32_CFLAGS} ${WIN32_LIBS} -Wl,--strip-all