[debhelper-devel] [debhelper] 01/01: Don't bother dealing with libdir/libexecdir for older compat versions

[Michael Biebl]

This is an automated email from the git hooks/post-receive script.

biebl pushed a commit to branch biebl/meson
in repository debhelper.

commit ab21a910eadd8f500021aa117f678a7beb63fba7
Author: Michael Biebl <biebl at debian.org>
Date:   Fri Mar 24 06:54:39 2017 +0100

    Don't bother dealing with libdir/libexecdir for older compat versions
    
    Since meson is new, we don't really have to care for backwards
    compatibility.
---
 Debian/Debhelper/Buildsystem/meson.pm | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem/meson.pm b/Debian/Debhelper/Buildsystem/meson.pm
index 90c0fcd..286fe1c 100644
--- a/Debian/Debhelper/Buildsystem/meson.pm
+++ b/Debian/Debhelper/Buildsystem/meson.pm
@@ -7,7 +7,7 @@ package Debian::Debhelper::Buildsystem::meson;
 
 use strict;
 use warnings;
-use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value sourcepackage compat);
+use Debian::Debhelper::Dh_Lib qw(dpkg_architecture_value);
 use parent qw(Debian::Debhelper::Buildsystem::ninja);
 
 sub DESCRIPTION {
@@ -42,18 +42,8 @@ sub configure {
 	push @opts, "--sysconfdir=/etc";
 	push @opts, "--localstatedir=/var";
 	my $multiarch=dpkg_architecture_value("DEB_HOST_MULTIARCH");
-	if (! compat(8)) {
-	       if (defined $multiarch) {
-			push @opts, "--libdir=lib/$multiarch";
-			push @opts, "--libexecdir=lib/$multiarch";
-		}
-		else {
-			push @opts, "--libexecdir=lib";
-		}
-	}
-	else {
-		push @opts, "--libexecdir=lib/" . sourcepackage();
-	}
+	push @opts, "--libdir=lib/$multiarch";
+	push @opts, "--libexecdir=lib/$multiarch";
 
 	$this->mkdir_builddir();
 	eval {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git