summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Estienne <sebastien.estienne@gmail.com>2006-01-20 21:53:25 +0000
committerSebastien Estienne <sebastien.estienne@gmail.com>2006-01-20 21:53:25 +0000
commit7d59b3ba820c19488b0637b5dd9798deb68fb0dc (patch)
tree0a4977946b3cd8b4884885d6e6e4bb991ec44e39
parent1463c6f70a4755ddbf447c00aacb78c66852424e (diff)
* adds pkgconfig fixes for x86_64 (because pkgconfig files should be written in $libdir, not $prefix/lib).
* 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
-rw-r--r--Makefile.am7
-rw-r--r--avahi-client.pc.in2
-rw-r--r--avahi-compat-howl.pc.in2
-rw-r--r--avahi-compat-libdns_sd.pc.in2
-rw-r--r--avahi-core.pc.in2
-rw-r--r--avahi-glib.pc.in2
-rw-r--r--avahi-qt3.pc.in2
-rw-r--r--avahi-qt4.pc.in2
8 files changed, 14 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 03117f4..3c75e1e 100644
--- 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 23a4d4f..65ee8d8 100644
--- 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 ceeef59..b3cd02a 100644
--- 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 9c170ba..d619632 100644
--- 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 e8629c0..52491b4 100644
--- 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 eadbfa2..f163e89 100644
--- 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 2c3b637..e9c52b9 100644
--- 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 b01b537..73cf6e2 100644
--- 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