diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-01-25 18:41:00 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-01-25 18:41:19 +0100 |
| commit | a1de2f6f5518981f277dc39b974d242b5519e76a (patch) | |
| tree | 9c1537d0cc4497ec2089952803b18fc98f5f6fe4 | |
| parent | 70fc887e1dd1a9386ecbb993fa865a5c9243df1e (diff) | |
| download | tde-packaging-a1de2f6f5518981f277dc39b974d242b5519e76a.tar.gz tde-packaging-a1de2f6f5518981f277dc39b974d242b5519e76a.zip | |
Use DESTDIR for required MakeMaker change in Perl 5.22 on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e3867b5c844de5292a150215a12fc1fb6f5c12ff)
| -rwxr-xr-x | debian/lenny/libraries/libtqt-perl/debian/rules | 5 | ||||
| -rwxr-xr-x | debian/squeeze/libraries/libtqt-perl/debian/rules | 5 | ||||
| -rwxr-xr-x | ubuntu/maverick/libraries/libtqt-perl/debian/rules | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/debian/lenny/libraries/libtqt-perl/debian/rules b/debian/lenny/libraries/libtqt-perl/debian/rules index 5efe954b5..0af0c47f4 100755 --- a/debian/lenny/libraries/libtqt-perl/debian/rules +++ b/debian/lenny/libraries/libtqt-perl/debian/rules @@ -28,9 +28,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --disable-rpath \ DEB_MAKE_INSTALL_TARGET := install \ - prefix=$(CURDIR)/debian/libtqt-perl/usr \ - PREFIX=$(CURDIR)/debian/libtqt-perl/usr \ - SITEPREFIX=$(CURDIR)/debian/libtqt-perl/usr \ + prefix=/usr \ + DESTDIR=$(CURDIR)/debian/libtqt-perl DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) diff --git a/debian/squeeze/libraries/libtqt-perl/debian/rules b/debian/squeeze/libraries/libtqt-perl/debian/rules index 5efe954b5..0af0c47f4 100755 --- a/debian/squeeze/libraries/libtqt-perl/debian/rules +++ b/debian/squeeze/libraries/libtqt-perl/debian/rules @@ -28,9 +28,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --disable-rpath \ DEB_MAKE_INSTALL_TARGET := install \ - prefix=$(CURDIR)/debian/libtqt-perl/usr \ - PREFIX=$(CURDIR)/debian/libtqt-perl/usr \ - SITEPREFIX=$(CURDIR)/debian/libtqt-perl/usr \ + prefix=/usr \ + DESTDIR=$(CURDIR)/debian/libtqt-perl DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/rules b/ubuntu/maverick/libraries/libtqt-perl/debian/rules index 5efe954b5..0af0c47f4 100755 --- a/ubuntu/maverick/libraries/libtqt-perl/debian/rules +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/rules @@ -28,9 +28,8 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --disable-rpath \ DEB_MAKE_INSTALL_TARGET := install \ - prefix=$(CURDIR)/debian/libtqt-perl/usr \ - PREFIX=$(CURDIR)/debian/libtqt-perl/usr \ - SITEPREFIX=$(CURDIR)/debian/libtqt-perl/usr \ + prefix=/usr \ + DESTDIR=$(CURDIR)/debian/libtqt-perl DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) |