Blob Blame Raw
From d82d8c84ba9f1d0ec90ea3a252e614da01a2df9a Mon Sep 17 00:00:00 2001
From: Chow Loong Jin <hyperair@ubuntu.com>
Date: Sat, 4 Sep 2010 16:51:35 +0200
Subject: [PATCH 1/2] [mono] fix dll name in dllmap

Correct the name of the dllmap from "libgpod" to "gpod", and remove
quotes from .so name
---
 bindings/mono/libgpod-sharp/Makefile.am            |    2 +-
 .../mono/libgpod-sharp/libgpod-sharp.dll.config.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bindings/mono/libgpod-sharp/Makefile.am b/bindings/mono/libgpod-sharp/Makefile.am
index 5663163..b3cd8c4 100644
--- a/bindings/mono/libgpod-sharp/Makefile.am
+++ b/bindings/mono/libgpod-sharp/Makefile.am
@@ -18,7 +18,7 @@ SOURCES =  \
 	Thumbnail.cs \
 	Track.cs
 
-dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g")
+dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g")
 libgpod-sharp.dll.config: $(top_srcdir)/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in 
 	sed "s/@DLNAME@/$(dlname)/g" $< >$@
 
diff --git a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in
index 01ad69a..cfa13ad 100644
--- a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in
+++ b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in
@@ -1,4 +1,4 @@
 <configuration>
-  <dllmap dll="libgpod" target="@DLNAME@"/>
+  <dllmap dll="gpod" target="@DLNAME@"/>
 </configuration>
 
-- 
1.7.2.2

diff -up libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in
--- libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig	2010-08-31 17:10:47.000000000 -0400
+++ libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in	2010-09-05 18:45:02.540553999 -0400
@@ -301,7 +301,7 @@ SOURCES = \
 	Thumbnail.cs \
 	Track.cs
 
-dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g")
+dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g")
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgpod-sharp.pc
 EXTRAS = \