[gentoo-commits] portage r13283 - in main/branches/prefix: . pym/portage

[gentoo-commits] portage r13283 - in main/branches/prefix: . pym/portage

[Fabian Groffen (grobian)]

Author: grobian
Date: 2009-04-03 10:16:35 +0000 (Fri, 03 Apr 2009)
New Revision: 13283

Modified:
   main/branches/prefix/configure.in
   main/branches/prefix/pym/portage/const.py
   main/branches/prefix/pym/portage/const_autotool.py
Log:
set BASH_BINARY and MOVE_BINARY based on what configure found

Modified: main/branches/prefix/configure.in
===================================================================
--- main/branches/prefix/configure.in	2009-04-03 01:20:00 UTC (rev 13282)
+++ main/branches/prefix/configure.in	2009-04-03 10:16:35 UTC (rev 13283)
@@ -33,10 +33,10 @@
 GENTOO_PATH_XCU_ID()
 GENTOO_PATH_PYTHON([2.4])
 
-AC_PATH_PROG(RM, [rm], no)
-AC_PATH_PROG(MV, [mv], no)
-AC_PATH_PROG(BASENAME, [basename], no)
-AC_PATH_PROG(DIRNAME, [dirname], no)
+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])
@@ -236,6 +236,18 @@
 AC_SUBST(PORTAGE_EPREFIX)
 AC_SUBST(DEFAULT_PATH)
 AC_SUBST(PORTAGE_BASE,['${exec_prefix}/lib/portage'])
+
+AC_SUBST(PORTAGE_RM)
+AC_SUBST(PORTAGE_MV)
+AC_SUBST(PORTAGE_BASENAME, [basename], no)
+AC_SUBST(PORTAGE_DIRNAME, [dirname], no)
+AC_SUBST(PORTAGE_BASH, [bash])
+AC_SUBST(PORTAGE_SED, [sed])
+AC_SUBST(PORTAGE_WGET, [wget])
+AC_SUBST(PORTAGE_FIND, [find])
+AC_SUBST(PORTAGE_XARGS, [xargs])
+AC_SUBST(PORTAGE_GREP, [grep])
+
 AM_CONDITIONAL(INSTALL_PYTHON_SOURCES, test x$enable_py_sources = xtrue)
 
 AC_MSG_CHECKING([for a list of variables known by configure])

Modified: main/branches/prefix/pym/portage/const.py
===================================================================
--- main/branches/prefix/pym/portage/const.py	2009-04-03 01:20:00 UTC (rev 13282)
+++ main/branches/prefix/pym/portage/const.py	2009-04-03 10:16:35 UTC (rev 13283)
@@ -57,8 +57,8 @@
 MISC_SH_BINARY          = PORTAGE_BIN_PATH+"/misc-functions.sh"
 SANDBOX_BINARY          = BPREFIX+"/usr/bin/sandbox"
 FAKEROOT_BINARY         = BPREFIX+"/usr/bin/fakeroot"
-BASH_BINARY             = BPREFIX+"/bin/bash"
-MOVE_BINARY             = BPREFIX+"/bin/mv"
+BASH_BINARY             = PORTAGE_BASH
+MOVE_BINARY             = PORTAGE_MV
 PRELINK_BINARY          = EPREFIX+"/usr/sbin/prelink"
 
 WORLD_FILE              = PRIVATE_PATH + "/world"

Modified: main/branches/prefix/pym/portage/const_autotool.py
===================================================================
--- main/branches/prefix/pym/portage/const_autotool.py	2009-04-03 01:20:00 UTC (rev 13282)
+++ main/branches/prefix/pym/portage/const_autotool.py	2009-04-03 10:16:35 UTC (rev 13283)
@@ -5,7 +5,8 @@
 # all vars that are to wind up in portage_const must have their name listed in __all__
 
 __all__ = ["EPREFIX", "SYSCONFDIR", "DATADIR", "PORTAGE_BASE",
-		"portageuser", "portagegroup", "rootuser", "rootuid", "rootgid"]
+		"portageuser", "portagegroup", "rootuser", "rootuid", "rootgid",
+		"PORTAGE_BASH", "PORTAGE_MV"]
 
 from os import path
 
@@ -19,3 +20,6 @@
 rootuser     = "@rootuser@"
 rootuid      = @rootuid@
 rootgid      = @rootgid@
+
+PORTAGE_BASH = "@PORTAGE_BASH"
+PORTAGE_MV   = "@PORTAGE_MV"