| 1 |
Author: grobian |
| 2 |
Date: 2009-04-03 10:16:35 +0000 (Fri, 03 Apr 2009) |
| 3 |
New Revision: 13283 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/configure.in |
| 7 |
main/branches/prefix/pym/portage/const.py |
| 8 |
main/branches/prefix/pym/portage/const_autotool.py |
| 9 |
Log: |
| 10 |
set BASH_BINARY and MOVE_BINARY based on what configure found |
| 11 |
|
| 12 |
Modified: main/branches/prefix/configure.in |
| 13 |
=================================================================== |
| 14 |
--- main/branches/prefix/configure.in 2009-04-03 01:20:00 UTC (rev 13282) |
| 15 |
+++ main/branches/prefix/configure.in 2009-04-03 10:16:35 UTC (rev 13283) |
| 16 |
@@ -33,10 +33,10 @@ |
| 17 |
GENTOO_PATH_XCU_ID() |
| 18 |
GENTOO_PATH_PYTHON([2.4]) |
| 19 |
|
| 20 |
-AC_PATH_PROG(RM, [rm], no) |
| 21 |
-AC_PATH_PROG(MV, [mv], no) |
| 22 |
-AC_PATH_PROG(BASENAME, [basename], no) |
| 23 |
-AC_PATH_PROG(DIRNAME, [dirname], no) |
| 24 |
+AC_PATH_PROG(PORTAGE_RM, [rm], no) |
| 25 |
+AC_PATH_PROG(PORTAGE_MV, [mv], no) |
| 26 |
+AC_PATH_PROG(PORTAGE_BASENAME, [basename], no) |
| 27 |
+AC_PATH_PROG(PORTAGE_DIRNAME, [dirname], no) |
| 28 |
dnl avoid bash internal variable messing up things here |
| 29 |
GENTOO_PATH_GNUPROG(PORTAGE_BASH, [bash]) |
| 30 |
GENTOO_PATH_GNUPROG(PORTAGE_SED, [sed]) |
| 31 |
@@ -236,6 +236,18 @@ |
| 32 |
AC_SUBST(PORTAGE_EPREFIX) |
| 33 |
AC_SUBST(DEFAULT_PATH) |
| 34 |
AC_SUBST(PORTAGE_BASE,['${exec_prefix}/lib/portage']) |
| 35 |
+ |
| 36 |
+AC_SUBST(PORTAGE_RM) |
| 37 |
+AC_SUBST(PORTAGE_MV) |
| 38 |
+AC_SUBST(PORTAGE_BASENAME, [basename], no) |
| 39 |
+AC_SUBST(PORTAGE_DIRNAME, [dirname], no) |
| 40 |
+AC_SUBST(PORTAGE_BASH, [bash]) |
| 41 |
+AC_SUBST(PORTAGE_SED, [sed]) |
| 42 |
+AC_SUBST(PORTAGE_WGET, [wget]) |
| 43 |
+AC_SUBST(PORTAGE_FIND, [find]) |
| 44 |
+AC_SUBST(PORTAGE_XARGS, [xargs]) |
| 45 |
+AC_SUBST(PORTAGE_GREP, [grep]) |
| 46 |
+ |
| 47 |
AM_CONDITIONAL(INSTALL_PYTHON_SOURCES, test x$enable_py_sources = xtrue) |
| 48 |
|
| 49 |
AC_MSG_CHECKING([for a list of variables known by configure]) |
| 50 |
|
| 51 |
Modified: main/branches/prefix/pym/portage/const.py |
| 52 |
=================================================================== |
| 53 |
--- main/branches/prefix/pym/portage/const.py 2009-04-03 01:20:00 UTC (rev 13282) |
| 54 |
+++ main/branches/prefix/pym/portage/const.py 2009-04-03 10:16:35 UTC (rev 13283) |
| 55 |
@@ -57,8 +57,8 @@ |
| 56 |
MISC_SH_BINARY = PORTAGE_BIN_PATH+"/misc-functions.sh" |
| 57 |
SANDBOX_BINARY = BPREFIX+"/usr/bin/sandbox" |
| 58 |
FAKEROOT_BINARY = BPREFIX+"/usr/bin/fakeroot" |
| 59 |
-BASH_BINARY = BPREFIX+"/bin/bash" |
| 60 |
-MOVE_BINARY = BPREFIX+"/bin/mv" |
| 61 |
+BASH_BINARY = PORTAGE_BASH |
| 62 |
+MOVE_BINARY = PORTAGE_MV |
| 63 |
PRELINK_BINARY = EPREFIX+"/usr/sbin/prelink" |
| 64 |
|
| 65 |
WORLD_FILE = PRIVATE_PATH + "/world" |
| 66 |
|
| 67 |
Modified: main/branches/prefix/pym/portage/const_autotool.py |
| 68 |
=================================================================== |
| 69 |
--- main/branches/prefix/pym/portage/const_autotool.py 2009-04-03 01:20:00 UTC (rev 13282) |
| 70 |
+++ main/branches/prefix/pym/portage/const_autotool.py 2009-04-03 10:16:35 UTC (rev 13283) |
| 71 |
@@ -5,7 +5,8 @@ |
| 72 |
# all vars that are to wind up in portage_const must have their name listed in __all__ |
| 73 |
|
| 74 |
__all__ = ["EPREFIX", "SYSCONFDIR", "DATADIR", "PORTAGE_BASE", |
| 75 |
- "portageuser", "portagegroup", "rootuser", "rootuid", "rootgid"] |
| 76 |
+ "portageuser", "portagegroup", "rootuser", "rootuid", "rootgid", |
| 77 |
+ "PORTAGE_BASH", "PORTAGE_MV"] |
| 78 |
|
| 79 |
from os import path |
| 80 |
|
| 81 |
@@ -19,3 +20,6 @@ |
| 82 |
rootuser = "@rootuser@" |
| 83 |
rootuid = @rootuid@ |
| 84 |
rootgid = @rootgid@ |
| 85 |
+ |
| 86 |
+PORTAGE_BASH = "@PORTAGE_BASH" |
| 87 |
+PORTAGE_MV = "@PORTAGE_MV" |
Archives