* adds pkgconfig fixes for x86_64 (because pkgconfig files should be written in...

 * This patch is from Oden Eriksson <oeriksson@mandriva.com>

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1091 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/Makefile.am b/Makefile.am
index 03117f4ee2b17bf885502c44325bc6308179cd76..3c75e1ec20fdf7dc02c9e7f0a9e01fe1e0c3b65a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,6 +103,7 @@ pkgconfig_DATA = avahi-core.pc
 
 avahi-core.pc: avahi-core.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES = avahi-core.pc
@@ -113,6 +114,7 @@ pkgconfig_DATA += avahi-client.pc
 
 avahi-client.pc: avahi-client.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-client.pc
@@ -123,6 +125,7 @@ pkgconfig_DATA += avahi-compat-howl.pc
 
 avahi-compat-howl.pc: avahi-compat-howl.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
 
 CLEANFILES += avahi-compat-howl.pc
@@ -135,6 +138,7 @@ pkgconfig_DATA += avahi-compat-libdns_sd.pc
 
 avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-compat-libdns_sd.pc
@@ -162,6 +166,7 @@ pkgconfig_DATA += avahi-glib.pc
 
 avahi-glib.pc: avahi-glib.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-glib.pc
@@ -174,6 +179,7 @@ pkgconfig_DATA += avahi-qt3.pc
 
 avahi-qt3.pc: avahi-qt3.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-qt3.pc
@@ -186,6 +192,7 @@ pkgconfig_DATA += avahi-qt4.pc
 
 avahi-qt4.pc: avahi-qt4.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-qt4.pc

diff --git a/avahi-client.pc.in b/avahi-client.pc.in
index 23a4d4fa798ed9acae0797ccf3845e8ba4651ef3..65ee8d8437dd8026ec99aa5d548b91c7310c2041 100644 (file)
--- a/avahi-client.pc.in
+++ b/avahi-client.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: avahi-client

diff --git a/avahi-compat-howl.pc.in b/avahi-compat-howl.pc.in
index ceeef59f622445a00c4d61a16a7359f921e31ece..b3cd02a709b60a6c9d268be748c31decb807e203 100644 (file)
--- a/avahi-compat-howl.pc.in
+++ b/avahi-compat-howl.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include/avahi-compat-howl/
 
 Name: avahi-compat-howl

diff --git a/avahi-compat-libdns_sd.pc.in b/avahi-compat-libdns_sd.pc.in
index 9c170ba4345b7a8ed0931db6499d2507240a4087..d619632540085e32d1652111c674f491926e1d25 100644 (file)
--- a/avahi-compat-libdns_sd.pc.in
+++ b/avahi-compat-libdns_sd.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include/avahi-compat-libdns_sd/
 
 Name: avahi-compat-libdns_sd

diff --git a/avahi-core.pc.in b/avahi-core.pc.in
index e8629c0ccc0e4314b8189ff4274a460c54d81c65..52491b41630ccc3528ea6f95c1b4ce60a1159fc7 100644 (file)
--- a/avahi-core.pc.in
+++ b/avahi-core.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: avahi-core

diff --git a/avahi-glib.pc.in b/avahi-glib.pc.in
index eadbfa2ef0f73311b462f3a2866c4b34e7fbf5cc..f163e8991fa262decd47e919e99b667417afc861 100644 (file)
--- a/avahi-glib.pc.in
+++ b/avahi-glib.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: avahi-glib

diff --git a/avahi-qt3.pc.in b/avahi-qt3.pc.in
index 2c3b637d80637f214ec36e9288683bbbaf3b5bfa..e9c52b91fd441fa98f594de0e77aaf3e3108ea7e 100644 (file)
--- a/avahi-qt3.pc.in
+++ b/avahi-qt3.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: avahi-qt3

diff --git a/avahi-qt4.pc.in b/avahi-qt4.pc.in
index b01b537704e16a5469e189154af7a24ec73c84b2..73cf6e296310e760578f14a143ddf669e9637772 100644 (file)
--- a/avahi-qt4.pc.in
+++ b/avahi-qt4.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: avahi-qt4