[gentoo-commits] proj/ufed:master commit in: /

[David Seifert]

commit:     52b31c56480cb8a05167094d65172e45a90bfc77
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 13:19:17 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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 <soap <AT> 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