From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B2E42138334 for ; Sun, 7 Apr 2019 13:20:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFAFBE088D; Sun, 7 Apr 2019 13:20:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F6BAE088D for ; Sun, 7 Apr 2019 13:20:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B13B335CA6 for ; Sun, 7 Apr 2019 13:20:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A50A457F for ; Sun, 7 Apr 2019 13:19:59 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1554643157.52b31c56480cb8a05167094d65172e45a90bfc77.soap@gentoo> Subject: [gentoo-commits] proj/ufed:master commit in: / X-VCS-Repository: proj/ufed X-VCS-Files: Makefile.am ufed.pl.in X-VCS-Directories: / X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 52b31c56480cb8a05167094d65172e45a90bfc77 X-VCS-Branch: master Date: Sun, 7 Apr 2019 13:19:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dd854263-c6c7-4d59-98b7-edc2333fd0e3 X-Archives-Hash: b3eccf491f1ddb5831b1441666c8f811 commit: 52b31c56480cb8a05167094d65172e45a90bfc77 Author: David Seifert gentoo org> AuthorDate: Sun Apr 7 13:19:17 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Apr 7 13:19:17 2019 +0000 URL: https://gitweb.gentoo.org/proj/ufed.git/commit/?id=52b31c56 Replace `libexecdir` by `pkglibexecdir` Signed-off-by: David Seifert gentoo.org> Makefile.am | 5 ++--- ufed.pl.in | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2e92da4..954f36b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,10 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PERL = @PERL@ -libexecdir = @libdir@/@PACKAGE@ perldir = @datadir@/@PACKAGE@ E_PREFIX := $(shell portageq envvar EPREFIX 2>/dev/null) sbin_SCRIPTS = ufed -libexec_PROGRAMS = ufed-curses +pkglibexec_PROGRAMS = ufed-curses dist_perl_DATA = Portage.pm ufed_curses_SOURCES = \ @@ -32,7 +31,7 @@ ufed: ufed.pl.in sed \ -e 's|XX_PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \ -e 's|XX_PERL[@]|$(PERL)|g' \ - -e 's|XX_libexecdir[@]|$(libexecdir)|g' \ + -e 's|XX_pkglibexecdir[@]|$(pkglibexecdir)|g' \ -e 's|XX_perldir[@]|$(perldir)|g' \ $< >$@.tmp chmod +x $@.tmp diff --git a/ufed.pl.in b/ufed.pl.in index fdcdf18..4cd2484 100644 --- a/ufed.pl.in +++ b/ufed.pl.in @@ -22,7 +22,7 @@ my $gdb = "gdb -ex run ufed-curses"; my $memcheck = "/usr/bin/valgrind -v --trace-children=yes --tool=memcheck" . " --track-origins=yes --leak-check=full --show-reachable=no" . " --read-var-info=yes" - . " XX_libexecdir@/ufed-curses 2>/tmp/ufed_memcheck.log"; + . " XX_pkglibexecdir@/ufed-curses 2>/tmp/ufed_memcheck.log"; sub finalise; sub flags_dialog; @@ -67,7 +67,7 @@ sub flags_dialog { POSIX::dup2 $owrite, 4; POSIX::close $owrite; if (0 == EXEC) { - exec { "XX_libexecdir@/$interface" } $interface or + exec { "XX_pkglibexecdir@/$interface" } $interface or do { print STDERR "Couldn't launch $interface\n"; exit 3 } } elsif (1 == EXEC) { exec $gdb or