[hyena] [build] Fix variable substition in pkg-config files

[Bertrand Lorentz <blorentz src gnome org>]

commit afaabc1442419a107899c86159db02414999601f
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sun Jul 11 16:49:41 2010 +0200

    [build] Fix variable substition in pkg-config files

 Hyena.Data.Sqlite/hyena.data.sqlite.pc.in |    9 ++++++---
 Hyena.Gui/hyena.gui.pc.in                 |    9 ++++++---
 Hyena/hyena.pc.in                         |    9 ++++++---
 Makefile.am                               |    2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/Hyena.Data.Sqlite/hyena.data.sqlite.pc.in b/Hyena.Data.Sqlite/hyena.data.sqlite.pc.in
index 860a16d..2eec264 100644
--- a/Hyena.Data.Sqlite/hyena.data.sqlite.pc.in
+++ b/Hyena.Data.Sqlite/hyena.data.sqlite.pc.in
@@ -1,9 +1,12 @@
-Assemblies= expanded_libdir@/@PACKAGE@/Hyena.Data.Sqlite.dll @expanded_libdir@/@PACKAGE@/Mono.Data.Sqlite.dll
-Files= expanded_libdir@/@PACKAGE@/Hyena.Data.Sqlite.dll.mdb @expanded_libdir@/@PACKAGE@/Mono.Data.Sqlite.dll.mdb
+prefix= prefix@
+libdir= libdir@
+
+Assemblies=${libdir}/@PACKAGE@/Hyena.Data.Sqlite.dll ${libdir}/@PACKAGE@/Mono.Data.Sqlite.dll
+Files=${libdir}/@PACKAGE@/Hyena.Data.Sqlite.dll.mdb ${libdir}/@PACKAGE@/Mono.Data.Sqlite.dll.mdb
 
 Name: Hyena.Data.Sqlite
 Description: Hyena.Data.Sqlite
 Version: @VERSION@
 
 Requires: 
-Libs: -r:@expanded_libdir@/@PACKAGE@/Hyena.Data.Sqlite.dll -r:@expanded_libdir@/@PACKAGE@/Mono.Data.Sqlite.dll
+Libs: -r:${libdir}/@PACKAGE@/Hyena.Data.Sqlite.dll -r:${libdir}/@PACKAGE@/Mono.Data.Sqlite.dll
diff --git a/Hyena.Gui/hyena.gui.pc.in b/Hyena.Gui/hyena.gui.pc.in
index 8189b8b..a23e986 100644
--- a/Hyena.Gui/hyena.gui.pc.in
+++ b/Hyena.Gui/hyena.gui.pc.in
@@ -1,9 +1,12 @@
-Assemblies= expanded_libdir@/@PACKAGE@/Hyena.Gui.dll
-Files= expanded_libdir@/@PACKAGE@/Hyena.Gui.dll.config @expanded_libdir@/@PACKAGE@/Hyena.Gui.dll.mdb
+prefix= prefix@
+libdir= libdir@
+
+Assemblies=${libdir}/@PACKAGE@/Hyena.Gui.dll
+Files=${libdir}/@PACKAGE@/Hyena.Gui.dll.config ${libdir}/@PACKAGE@/Hyena.Gui.dll.mdb
 
 Name: Hyena.Gui
 Description: Hyena.Gui
 Version: @VERSION@
 
 Requires: 
-Libs: -r:@expanded_libdir@/@PACKAGE@/Hyena.Gui.dll
+Libs: -r:${libdir}/@PACKAGE@/Hyena.Gui.dll
diff --git a/Hyena/hyena.pc.in b/Hyena/hyena.pc.in
index b8bef68..2bc79d3 100644
--- a/Hyena/hyena.pc.in
+++ b/Hyena/hyena.pc.in
@@ -1,9 +1,12 @@
-Assemblies= expanded_libdir@/@PACKAGE@/Hyena.dll
-Files= expanded_libdir@/@PACKAGE@/Hyena.dll.mdb
+prefix= prefix@
+libdir= libdir@
+
+Assemblies=${libdir}/@PACKAGE@/Hyena.dll
+Files=${libdir}/@PACKAGE@/Hyena.dll.mdb
 
 Name: Hyena
 Description: Hyena
 Version: @VERSION@
 
 Requires: 
-Libs: -r:@expanded_libdir@/@PACKAGE@/Hyena.dll
+Libs: -r:${libdir}/@PACKAGE@/Hyena.dll
diff --git a/Makefile.am b/Makefile.am
index f89dc68..9a7e4a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
 EXTRA_DIST = $(pkgconfig_in_files)
 CLEANFILES = $(pkgconfig_DATA)
 %.pc: $(pkgconfig_in_files)
-	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" < $< > $@
 
 MAINTAINERCLEANFILES = \
 	compile \