commit: ec60a2a55736e09e517af0e0531ca31acfc622a1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 16 18:52:38 2025 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 16 18:52:38 2025 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ec60a2a5
autoconf: cleanup no longer used expansions
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
configure.ac | 18 ------------------
subst-install.in | 3 ---
2 files changed, 21 deletions(-)
diff --git a/configure.ac b/configure.ac
index 50abd6e164..b993e96830 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,17 +33,8 @@ AC_PROG_EGREP
GENTOO_PATH_XCU_ID()
GENTOO_PATH_PYTHON([2.7])
-AC_PATH_PROG(PORTAGE_RM, [rm], no)
-AC_PATH_PROG(PORTAGE_MV, [mv], no)
-AC_PATH_PROG(PORTAGE_BASENAME, [basename], no)
-AC_PATH_PROG(PORTAGE_DIRNAME, [dirname], no)
dnl avoid bash internal variable messing up things here
GENTOO_PATH_GNUPROG(PORTAGE_BASH, [bash])
-GENTOO_PATH_GNUPROG(PORTAGE_SED, [sed])
-GENTOO_PATH_GNUPROG(PORTAGE_WGET, [wget])
-GENTOO_PATH_GNUPROG(PORTAGE_FIND, [find])
-GENTOO_PATH_GNUPROG(PORTAGE_XARGS, [xargs])
-GENTOO_PATH_GNUPROG(PORTAGE_GREP, [grep])
AC_ARG_WITH(offset-prefix,
AS_HELP_STRING([--with-offset-prefix],[specify the installation prefix for all
packages, defaults to an empty string]),
@@ -58,16 +49,7 @@ fi
AC_SUBST(PORTAGE_EPREFIX)
AC_SUBST(PORTAGE_BASE,['${exec_prefix}/lib/portage'])
-AC_SUBST(PORTAGE_RM)
-AC_SUBST(PORTAGE_MV)
-AC_SUBST(PORTAGE_BASENAME)
-AC_SUBST(PORTAGE_DIRNAME)
AC_SUBST(PORTAGE_BASH)
-AC_SUBST(PORTAGE_SED)
-AC_SUBST(PORTAGE_WGET)
-AC_SUBST(PORTAGE_FIND)
-AC_SUBST(PORTAGE_XARGS)
-AC_SUBST(PORTAGE_GREP)
AC_CONFIG_FILES([subst-install], [chmod +x subst-install])
AC_CONFIG_FILES([
diff --git a/subst-install.in b/subst-install.in
index 9734e3be13..2c3297a7ec 100644
--- a/subst-install.in
+++ b/subst-install.in
@@ -12,9 +12,6 @@ sedexp=(
-e "s,${at}PORTAGE_BASE${at},@PORTAGE_BASE@,g"
-e "s,${at}PORTAGE_BASE_PATH${at},@PORTAGE_BASE@,g"
-e "s,${at}PORTAGE_BIN_PATH${at},@PORTAGE_BASE@/bin,g"
- -e "s,${at}PORTAGE_BASH${at},@PORTAGE_BASH@,g"
- -e "s,${at}PORTAGE_EPREFIX${at},@PORTAGE_EPREFIX@,g"
- -e "s,${at}PORTAGE_MV${at},@PORTAGE_MV@,g"
-e "s,${at}PREFIX_PORTAGE_PYTHON${at},@PREFIX_PORTAGE_PYTHON@,g"
-e "s,${at}EPREFIX${at},@PORTAGE_EPREFIX@,g"
-e "s,${at}INSTALL_TYPE${at},SYSTEM,g"
