GNOME.org
 

[banshee] build: Fix bansheedir in *.pc (bgo#644656)

commit 27d1a36c52f6863512b79dff693048334e14f15d
Author: Chow Loong Jin <hyperair ubuntu com>
Date:   Mon Mar 14 01:16:32 2011 +0800

    build: Fix bansheedir in *.pc (bgo#644656)
    
    Don't hardcode bansheedir to ${libdir}/banshee-1, but instead use
    ${libdir}/@PACKAGE   This fixes the issue with bansheedir pointing to
    /usr/lib/banshee-1 post-rename of the package.
    
    Signed-off-by: Gabriel Burt <gabriel burt gmail com>

 build/pkg-config/Makefile.am                       |    2 +-
 .../pkg-config/banshee-1-collection-indexer.pc.in  |    2 +-
 build/pkg-config/banshee-1-core.pc.in              |    2 +-
 build/pkg-config/banshee-1-hyena-data-sqlite.pc.in |    2 +-
 build/pkg-config/banshee-1-hyena-gui.pc.in         |    2 +-
 build/pkg-config/banshee-1-hyena.pc.in             |    2 +-
 build/pkg-config/banshee-1-lastfm-gui.pc.in        |    2 +-
 build/pkg-config/banshee-1-lastfm.pc.in            |    2 +-
 build/pkg-config/banshee-1-mono-media.pc.in        |    2 +-
 build/pkg-config/banshee-1-musicbrainz.pc.in       |    2 +-
 build/pkg-config/banshee-1-nowplaying.pc.in        |    2 +-
 build/pkg-config/banshee-1-services.pc.in          |    2 +-
 build/pkg-config/banshee-1-thickclient.pc.in       |    2 +-
 build/pkg-config/banshee-1-webbrowser.pc.in        |    2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/build/pkg-config/Makefile.am b/build/pkg-config/Makefile.am
index a302874..d139a45 100644
--- a/build/pkg-config/Makefile.am
+++ b/build/pkg-config/Makefile.am
@@ -3,7 +3,7 @@ pkgconfig_in_files = $(wildcard banshee-1-*.pc.in)
 pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
 
 %.pc: %.pc.in $(top_builddir)/configure.ac
-	sed "s,\ VERSION\@,$(VERSION),g; s,\ prefix\@,$(prefix),g; s,\ libdir\@,$(libdir),g" < $< > $@
+	sed "s,\ VERSION\@,$(VERSION),g; s,\ prefix\@,$(prefix),g; s,\ libdir\@,$(libdir),g; s,\ PACKAGE\@,$(PACKAGE),g" < $< > $@
 
 EXTRA_DIST = $(pkgconfig_in_files)
 
diff --git a/build/pkg-config/banshee-1-collection-indexer.pc.in b/build/pkg-config/banshee-1-collection-indexer.pc.in
index 4918c27..935659f 100644
--- a/build/pkg-config/banshee-1-collection-indexer.pc.in
+++ b/build/pkg-config/banshee-1-collection-indexer.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 Libraries=${bansheedir}/Banshee.CollectionIndexer.dll
 
 Name: Banshee Collection Indexer Helper
diff --git a/build/pkg-config/banshee-1-core.pc.in b/build/pkg-config/banshee-1-core.pc.in
index b72e713..cc4118a 100644
--- a/build/pkg-config/banshee-1-core.pc.in
+++ b/build/pkg-config/banshee-1-core.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee Core
 Description: Core APIs for the Banshee Media Framework
diff --git a/build/pkg-config/banshee-1-hyena-data-sqlite.pc.in b/build/pkg-config/banshee-1-hyena-data-sqlite.pc.in
index b6b2e7b..eae1119 100644
--- a/build/pkg-config/banshee-1-hyena-data-sqlite.pc.in
+++ b/build/pkg-config/banshee-1-hyena-data-sqlite.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee Hyena
 Description: Hyena sqlite libraries for the Banshee Media Framework
diff --git a/build/pkg-config/banshee-1-hyena-gui.pc.in b/build/pkg-config/banshee-1-hyena-gui.pc.in
index ebba8c3..ea248e0 100644
--- a/build/pkg-config/banshee-1-hyena-gui.pc.in
+++ b/build/pkg-config/banshee-1-hyena-gui.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee Hyena GUI
 Description: Hyena GUI libraries for the Banshee Media Framework
diff --git a/build/pkg-config/banshee-1-hyena.pc.in b/build/pkg-config/banshee-1-hyena.pc.in
index 03fdd58..ae95ead 100644
--- a/build/pkg-config/banshee-1-hyena.pc.in
+++ b/build/pkg-config/banshee-1-hyena.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee Hyena
 Description: Hyena libraries for the Banshee Media Framework
diff --git a/build/pkg-config/banshee-1-lastfm-gui.pc.in b/build/pkg-config/banshee-1-lastfm-gui.pc.in
index 0d31fa8..d071a01 100644
--- a/build/pkg-config/banshee-1-lastfm-gui.pc.in
+++ b/build/pkg-config/banshee-1-lastfm-gui.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee Last.fm GUI
 Description: Last.fm GUI libraries for the Banshee Media Framework
diff --git a/build/pkg-config/banshee-1-lastfm.pc.in b/build/pkg-config/banshee-1-lastfm.pc.in
index 5652709..3cebcdd 100644
--- a/build/pkg-config/banshee-1-lastfm.pc.in
+++ b/build/pkg-config/banshee-1-lastfm.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee Last.fm
 Description: Last.fm libraries for the Banshee Media Framework
diff --git a/build/pkg-config/banshee-1-mono-media.pc.in b/build/pkg-config/banshee-1-mono-media.pc.in
index 30b20a0..e688464 100644
--- a/build/pkg-config/banshee-1-mono-media.pc.in
+++ b/build/pkg-config/banshee-1-mono-media.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee Mono.Media
 Description: Mono.Media libraries for the Banshee Media Framework
diff --git a/build/pkg-config/banshee-1-musicbrainz.pc.in b/build/pkg-config/banshee-1-musicbrainz.pc.in
index 873125b..11f7613 100644
--- a/build/pkg-config/banshee-1-musicbrainz.pc.in
+++ b/build/pkg-config/banshee-1-musicbrainz.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee MusicBrainz
 Description: MusicBrainz libraries for the Banshee Media Framework
diff --git a/build/pkg-config/banshee-1-nowplaying.pc.in b/build/pkg-config/banshee-1-nowplaying.pc.in
index 826a4c5..d92aaf2 100644
--- a/build/pkg-config/banshee-1-nowplaying.pc.in
+++ b/build/pkg-config/banshee-1-nowplaying.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee NowPlaying
 Description: Now Playing extension source for Banshee
diff --git a/build/pkg-config/banshee-1-services.pc.in b/build/pkg-config/banshee-1-services.pc.in
index cfe6e66..3f747e1 100644
--- a/build/pkg-config/banshee-1-services.pc.in
+++ b/build/pkg-config/banshee-1-services.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee Services
 Description: Service layer APIs for the Banshee Media Framework
diff --git a/build/pkg-config/banshee-1-thickclient.pc.in b/build/pkg-config/banshee-1-thickclient.pc.in
index d853c45..94de4c7 100644
--- a/build/pkg-config/banshee-1-thickclient.pc.in
+++ b/build/pkg-config/banshee-1-thickclient.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee ThickClient
 Description: GUI Service layer APIs for the Banshee Media Framework
diff --git a/build/pkg-config/banshee-1-webbrowser.pc.in b/build/pkg-config/banshee-1-webbrowser.pc.in
index 447e513..5966520 100644
--- a/build/pkg-config/banshee-1-webbrowser.pc.in
+++ b/build/pkg-config/banshee-1-webbrowser.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 exec_prefix=${prefix}
 libdir= libdir@
-bansheedir=${libdir}/banshee-1
+bansheedir=${libdir}/@PACKAGE@
 
 Name: Banshee WebBrowser
 Description: Embedded web browser for the Banshee Media Framework
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]