|
 |
ad7ead0 |
From d82d8c84ba9f1d0ec90ea3a252e614da01a2df9a Mon Sep 17 00:00:00 2001
|
|
|
ad7ead0 |
From: Chow Loong Jin <hyperair@ubuntu.com>
|
|
|
ad7ead0 |
Date: Sat, 4 Sep 2010 16:51:35 +0200
|
|
|
ad7ead0 |
Subject: [PATCH 1/2] [mono] fix dll name in dllmap
|
|
|
ad7ead0 |
|
|
|
ad7ead0 |
Correct the name of the dllmap from "libgpod" to "gpod", and remove
|
|
|
ad7ead0 |
quotes from .so name
|
|
|
ad7ead0 |
---
|
|
|
ad7ead0 |
bindings/mono/libgpod-sharp/Makefile.am | 2 +-
|
|
|
ad7ead0 |
.../mono/libgpod-sharp/libgpod-sharp.dll.config.in | 2 +-
|
|
|
ad7ead0 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
ad7ead0 |
|
|
|
ad7ead0 |
diff --git a/bindings/mono/libgpod-sharp/Makefile.am b/bindings/mono/libgpod-sharp/Makefile.am
|
|
|
ad7ead0 |
index 5663163..b3cd8c4 100644
|
|
|
ad7ead0 |
--- a/bindings/mono/libgpod-sharp/Makefile.am
|
|
|
ad7ead0 |
+++ b/bindings/mono/libgpod-sharp/Makefile.am
|
|
|
ad7ead0 |
@@ -18,7 +18,7 @@ SOURCES = \
|
|
|
ad7ead0 |
Thumbnail.cs \
|
|
|
ad7ead0 |
Track.cs
|
|
|
ad7ead0 |
|
|
|
ad7ead0 |
-dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g")
|
|
|
ad7ead0 |
+dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g")
|
|
|
ad7ead0 |
libgpod-sharp.dll.config: $(top_srcdir)/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in
|
|
|
ad7ead0 |
sed "s/@DLNAME@/$(dlname)/g" $< >$@
|
|
|
ad7ead0 |
|
|
|
ad7ead0 |
diff --git a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in
|
|
|
ad7ead0 |
index 01ad69a..cfa13ad 100644
|
|
|
ad7ead0 |
--- a/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in
|
|
|
ad7ead0 |
+++ b/bindings/mono/libgpod-sharp/libgpod-sharp.dll.config.in
|
|
|
ad7ead0 |
@@ -1,4 +1,4 @@
|
|
|
ad7ead0 |
<configuration>
|
|
|
ad7ead0 |
- <dllmap dll="libgpod" target="@DLNAME@"/>
|
|
|
ad7ead0 |
+ <dllmap dll="gpod" target="@DLNAME@"/>
|
|
|
ad7ead0 |
</configuration>
|
|
|
ad7ead0 |
|
|
|
ad7ead0 |
--
|
|
|
ad7ead0 |
1.7.2.2
|
|
|
ad7ead0 |
|
|
|
ad7ead0 |
diff -up libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in
|
|
|
ad7ead0 |
--- libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in.orig 2010-08-31 17:10:47.000000000 -0400
|
|
|
ad7ead0 |
+++ libgpod-0.7.94/bindings/mono/libgpod-sharp/Makefile.in 2010-09-05 18:45:02.540553999 -0400
|
|
|
ad7ead0 |
@@ -301,7 +301,7 @@ SOURCES = \
|
|
|
ad7ead0 |
Thumbnail.cs \
|
|
|
ad7ead0 |
Track.cs
|
|
|
ad7ead0 |
|
|
|
ad7ead0 |
-dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname=\(.*\)/\1/g")
|
|
|
ad7ead0 |
+dlname := $(shell grep "^dlname=" $(top_builddir)/src/libgpod.la | sed "s/^dlname='\(.*\)'/\1/g")
|
|
|
ad7ead0 |
pkgconfigdir = $(libdir)/pkgconfig
|
|
|
ad7ead0 |
pkgconfig_DATA = libgpod-sharp.pc
|
|
|
ad7ead0 |
EXTRAS = \
|