From 98e89a63eeaa9f9a8cc9ec66828cb2862a3f3068 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 16:39:48 -0600 Subject: [PATCH] Fix potential avahi-tqt FTBFS on Debian and Ubuntu (cherry picked from commit 9fe79a3cf830d9e548514afc407f9f4ec5443ed0) --- debian/lenny/dependencies/avahi-tqt/debian/rules | 3 ++- debian/squeeze/dependencies/avahi-tqt/debian/rules | 3 ++- ubuntu/maverick/dependencies/avahi-tqt/debian/rules | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/lenny/dependencies/avahi-tqt/debian/rules b/debian/lenny/dependencies/avahi-tqt/debian/rules index 54a22a44f..ac6ff10f3 100755 --- a/debian/lenny/dependencies/avahi-tqt/debian/rules +++ b/debian/lenny/dependencies/avahi-tqt/debian/rules @@ -8,6 +8,7 @@ include /usr/share/cdbs/1/class/autotools.mk export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 DEB_CONFIGURE_EXTRA_FLAGS += \ + --prefix=/usr \ --enable-compat-libdns_sd \ --disable-mono --disable-monodoc \ --disable-gtk3 \ @@ -19,6 +20,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ./autogen.sh + ./autogen.sh --prefix=/usr rm ./ChangeLog touch debian/stamp-bootstrap diff --git a/debian/squeeze/dependencies/avahi-tqt/debian/rules b/debian/squeeze/dependencies/avahi-tqt/debian/rules index 54a22a44f..ac6ff10f3 100755 --- a/debian/squeeze/dependencies/avahi-tqt/debian/rules +++ b/debian/squeeze/dependencies/avahi-tqt/debian/rules @@ -8,6 +8,7 @@ include /usr/share/cdbs/1/class/autotools.mk export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 DEB_CONFIGURE_EXTRA_FLAGS += \ + --prefix=/usr \ --enable-compat-libdns_sd \ --disable-mono --disable-monodoc \ --disable-gtk3 \ @@ -19,6 +20,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ./autogen.sh + ./autogen.sh --prefix=/usr rm ./ChangeLog touch debian/stamp-bootstrap diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules index 54a22a44f..ac6ff10f3 100755 --- a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules @@ -8,6 +8,7 @@ include /usr/share/cdbs/1/class/autotools.mk export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1 DEB_CONFIGURE_EXTRA_FLAGS += \ + --prefix=/usr \ --enable-compat-libdns_sd \ --disable-mono --disable-monodoc \ --disable-gtk3 \ @@ -19,6 +20,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ post-patches:: debian/stamp-bootstrap debian/stamp-bootstrap: - ./autogen.sh + ./autogen.sh --prefix=/usr rm ./ChangeLog touch debian/stamp-bootstrap