--- Makefile.orig	2012-08-06 13:24:43.000000000 +0200
+++ Makefile	2013-12-05 14:23:50.881516874 +0100
@@ -27,7 +27,7 @@
 LDFLAGS += -L/usr/sfw/lib -R/usr/sfw/lib
 endif
 else
-CC = gcc
+CC ?= gcc
 CFLAGS += -std=c99 -Wall
 INSTALL = install -c
 MSGFMT = msgfmt
@@ -126,8 +126,8 @@
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/applications
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/pixmaps
-	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/gconf
-	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/gconf/schemas
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/etc/gconf
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/etc/gconf/schemas
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/locale
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/locale/es
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/locale/it
@@ -154,18 +154,16 @@
 	$(INSTALL) -m 644 images/empty.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
 	$(INSTALL) -m 644 images/view-refresh.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
 	$(INSTALL) -m 644 misc/gMTP.desktop $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL) -m 644 images/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps
-	$(INSTALL) -m 644 misc/gMTP.schemas $(DESTDIR)$(PREFIX)/share/gconf/schemas
-	mv $(DESTDIR)$(PREFIX)/share/pixmaps/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
+	$(INSTALL) -m 644 images/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
+	$(INSTALL) -m 644 misc/gMTP.schemas $(DESTDIR)$(PREFIX)/etc/gconf/schemas/gmtp.schemas
 	cp po/es.mo $(DESTDIR)$(PREFIX)/share/locale/es/LC_MESSAGES/gmtp.mo
 	cp po/fr.mo $(DESTDIR)$(PREFIX)/share/locale/fr/LC_MESSAGES/gmtp.mo
 	cp po/it.mo $(DESTDIR)$(PREFIX)/share/locale/it/LC_MESSAGES/gmtp.mo
 	cp po/da.mo $(DESTDIR)$(PREFIX)/share/locale/da/LC_MESSAGES/gmtp.mo
 	cp po/de.mo $(DESTDIR)$(PREFIX)/share/locale/de/LC_MESSAGES/gmtp.mo
-	mv $(DESTDIR)$(PREFIX)/share/gconf/schemas/gMTP.schemas $(DESTDIR)$(PREFIX)/share/gconf/schemas/gmtp.schemas
 
 register-gconf-schemas: install
-	GCONF_CONFIG_SOURCE=`$(GCONFTOOL) --get-default-source` $(GCONFTOOL) --makefile-install-rule $(DESTDIR)$(PREFIX)/share/gconf/schemas/gmtp.schemas
+	GCONF_CONFIG_SOURCE=`$(GCONFTOOL) --get-default-source` $(GCONFTOOL) --makefile-install-rule $(DESTDIR)$(PREFIX)/etc/gconf/schemas/gmtp.schemas
 
 install-gtk3: gmtp $(catalogues)
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)
@@ -193,7 +191,7 @@
 	$(INSTALL) -m 644 images/logo.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
 	$(INSTALL) -m 644 images/stock-about-16.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
 	$(INSTALL) -m 644 misc/gMTP.desktop $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL) -m 644 images/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps
+	$(INSTALL) -m 644 images/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
 	$(INSTALL) -m 644 images/audio-x-mp3-playlist.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
 	$(INSTALL) -m 644 images/audio-x-mpeg.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
 	$(INSTALL) -m 644 images/folder.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
@@ -203,7 +201,7 @@
 	$(INSTALL) -m 644 images/video-x-generic.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
 	$(INSTALL) -m 644 images/empty.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
 	$(INSTALL) -m 644 images/view-refresh.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
-	mv $(DESTDIR)$(PREFIX)/share/pixmaps/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
+	$(INSTALL) -m 644 misc/org.gnome.gmtp.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 	cp po/es.mo $(DESTDIR)$(PREFIX)/share/locale/es/LC_MESSAGES/gmtp.mo
 	cp po/fr.mo $(DESTDIR)$(PREFIX)/share/locale/fr/LC_MESSAGES/gmtp.mo
 	cp po/it.mo $(DESTDIR)$(PREFIX)/share/locale/it/LC_MESSAGES/gmtp.mo
@@ -211,7 +209,6 @@
 	cp po/de.mo $(DESTDIR)$(PREFIX)/share/locale/de/LC_MESSAGES/gmtp.mo
 
 register-gsettings-schemas: install-gtk3
-	$(INSTALL) -m 644 misc/org.gnome.gmtp.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 
 install-doc:
@@ -227,7 +224,7 @@
 	rm -f  $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)/*
 	rm -f  $(DESTDIR)$(PREFIX)/share/applications/gMTP.desktop
 	rm -f  $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
-	rm -f  $(DESTDIR)$(PREFIX)/share/gconf/schemas/gmtp.schemas
+	rm -f  $(DESTDIR)$(PREFIX)/share/etc/schemas/gmtp.schemas
 	rm -f  $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.gnome.gMTP.gschema.xml
 	rm -f  $(DESTDIR)$(PREFIX)/share/locale/es/LC_MESSAGES/gmtp.mo
 	rm -f  $(DESTDIR)$(PREFIX)/share/locale/fr/LC_MESSAGES/gmtp.mo