Hi,

I was doing a test build of upcoming exaile-0.2.10 for Fedora, and I
noticed a couple of issues with the current setup.
Firstly, the Makefile hardcodes the _libdir to $(PREFIX)/lib which is
not suitable for x86_64 systems. Secondly, the each of the Mimekey
types in the desktop file is at least listed twice, (there's also a
typo in one of them). The attached patches fixes both issues.

Deji
--- exaile.desktop	2007-06-20 22:10:37.000000000 -0400
+++ exaile.desktop.new	2007-06-20 23:13:17.000000000 -0400
@@ -26,5 +26,5 @@
 Terminal=false
 Type=Application
 Icon=exaile.png
-Categories=Application;AudioVideo;AudioPlayer;GTK
-MimeType=audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audip/mp3;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audip/mp3;audio/x-m4a;audio/x-m4a;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;application/ogg;application/x-ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;application/ogg;application/x-ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;audio/x-flac;application/x-flac;audio/flac;audio/x-flac;application/x-flac;audio/flac;
+Categories=Application;AudioVideo;AudioPlayer;GTK;
+MimeType=audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-musepack;application/x-musepack;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audio/mp3;audio/x-m4a;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;application/ogg;application/x-ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;audio/x-flac;application/x-flac;audio/flac;
--- Makefile	2007-06-20 22:10:37.000000000 -0400
+++ Makefile.new	2007-06-20 22:45:56.000000000 -0400
@@ -1,5 +1,6 @@
 PREFIX ?= /usr/local
 FIREFOX ?= /usr/lib/firefox
+LIBDIR ?= /usr/local/lib
 
 all: compile mmkeys.so translations
 	@echo "Done"
@@ -16,8 +17,8 @@
 
 make-install-dirs: 
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/exaile
+	mkdir -p $(DESTDIR)$(LIBDIR)
+	mkdir -p $(DESTDIR)$(LIBDIR)/exaile
 	mkdir -p $(DESTDIR)$(PREFIX)/share/
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
@@ -38,7 +39,7 @@
 	install -m 644 exaile.glade $(DESTDIR)$(PREFIX)/share/exaile
 	install -m 644 equalizer.ini $(DESTDIR)$(PREFIX)/share/exaile
 	install -m 644 sql/*.sql $(DESTDIR)$(PREFIX)/share/exaile/sql
-	-install -m 644 mmkeys.so $(DESTDIR)$(PREFIX)/lib/exaile
+	-install -m 644 mmkeys.so $(DESTDIR)$(LIBDIR)/exaile
 	install -m 644 images/*.png $(DESTDIR)$(PREFIX)/share/exaile/images
 	install -m 644 images/default_theme/*.png \
 	$(DESTDIR)$(PREFIX)/share/exaile/images/default_theme
@@ -78,7 +79,7 @@
 
 uninstall:
 	rm -r $(DESTDIR)$(PREFIX)/share/exaile
-	rm -r $(DESTDIR)$(PREFIX)/lib/exaile
+	rm -r $(DESTDIR)$(LIBDIR)/exaile
 	rm -r $(DESTDIR)$(PREFIX)/bin/exaile
 	rm  $(DESTDIR)$(PREFIX)/share/applications/exaile.desktop
 	rm  $(DESTDIR)$(PREFIX)/share/pixmaps/exaile.png
_______________________________________________
Exaile-devel mailing list
[email protected]
http://exaile.org/mailman/listinfo/exaile-devel

Reply via email to