cowbell r47 - in trunk: . base gui musicbrainz-sharp

[btaylor svn gnome org]

Author: btaylor
Date: Wed Dec 10 16:52:43 2008
New Revision: 47
URL: http://svn.gnome.org/viewvc/cowbell?rev=47&view=rev

Log:
2008-12-10  Brad Taylor  <brad getcoded net>

	* gui/cowbell.in:
	* gui/Makefile.am: Fix wrapper script for x86_64 platforms.

	* gui/Makefile.am: 
	* base/Makefile.am: 
	* musicbrainz-sharp/Makefile.am: Patch from Frederic Peters
	<fpeters 0d be> to fix build. [Fixes #557635]



Modified:
   trunk/ChangeLog
   trunk/base/Makefile.am
   trunk/gui/Makefile.am
   trunk/gui/cowbell.in
   trunk/musicbrainz-sharp/Makefile.am

Modified: trunk/base/Makefile.am
==============================================================================
--- trunk/base/Makefile.am	(original)
+++ trunk/base/Makefile.am	Wed Dec 10 16:52:43 2008
@@ -40,7 +40,7 @@
 $(DLL): $(build_sources) $(RESOURCES)
 	$(CSC) /warnaserror /t:library /codepage:utf8 /debug /out:$@ $(REFERENCES) $(build_sources)
 
-cowbelldir = $(prefix)/lib/cowbell
+cowbelldir = $(libdir)/cowbell
 cowbell_DATA = $(DLL)
 
 CLEANFILES = $(DLL) $(DLL).mdb

Modified: trunk/gui/Makefile.am
==============================================================================
--- trunk/gui/Makefile.am	(original)
+++ trunk/gui/Makefile.am	Wed Dec 10 16:52:43 2008
@@ -50,13 +50,14 @@
 
 $(WRAPPER): $(srcdir)/$(WRAPPER).in
 	sed -e "s|\ prefix\@|$(prefix)|g"         \
-            -e "s|\ dll\@|$(ASSEMBLY)|g"               \
-            -e "s|\ runtime\@|$(RUNTIME)|g"               \
+            -e "s|\ libdir\@|$(libdir)|g"         \
+            -e "s|\ dll\@|$(ASSEMBLY)|g"          \
+            -e "s|\ runtime\@|$(RUNTIME)|g"       \
             < $^ > $@
 	chmod +x $(WRAPPER)
 
 bin_SCRIPTS = $(WRAPPER)
-cowbelldir = $(prefix)/lib/cowbell
+cowbelldir = $(libdir)/cowbell
 cowbell_DATA = $(ASSEMBLY) $(ASSEMBLY).config
 
 CLEANFILES = $(WRAPPER) $(ASSEMBLY) $(ASSEMBLY).mdb

Modified: trunk/gui/cowbell.in
==============================================================================
--- trunk/gui/cowbell.in	(original)
+++ trunk/gui/cowbell.in	Wed Dec 10 16:52:43 2008
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-libdir="@prefix@/lib/cowbell"
+libdir="@libdir@/cowbell"
 export LD_LIBRARY_PATH=${libdir}${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
 
 if [ -e ./@dll@ ] && [ -e ./Makefile.am ]; then

Modified: trunk/musicbrainz-sharp/Makefile.am
==============================================================================
--- trunk/musicbrainz-sharp/Makefile.am	(original)
+++ trunk/musicbrainz-sharp/Makefile.am	Wed Dec 10 16:52:43 2008
@@ -5,9 +5,10 @@
 FILES = \
 MusicBrainz/Artist.cs \
 MusicBrainz/Disc.cs \
+MusicBrainz/DiscLinux.cs \
+MusicBrainz/DiscWin32.cs \
 MusicBrainz/Event.cs \
 MusicBrainz/Label.cs \
-MusicBrainz/LinuxDisc.cs \
 MusicBrainz/LocalDisc.cs \
 MusicBrainz/MusicBrainzEntity.cs \
 MusicBrainz/MusicBrainzException.cs \
@@ -19,7 +20,6 @@
 MusicBrainz/Release.cs \
 MusicBrainz/Track.cs \
 MusicBrainz/Utils.cs \
-MusicBrainz/Win32Disc.cs \
 MusicBrainz/XmlRequestEventArgs.cs 
 
 build_sources = $(addprefix $(srcdir)/, $(FILES))
@@ -30,7 +30,7 @@
 	$(CSC) /warnaserror /t:library /codepage:utf8 /debug /out:$@ $(REFERENCES) $(build_sources)
 	cp $(DLL) ../gui
 
-cowbelldir = $(prefix)/lib/cowbell
+cowbelldir = $(libdir)/cowbell
 cowbell_DATA = $(DLL)
 
 CLEANFILES = $(DLL) $(DLL).mdb