| 1 |
commit: 46324633cbcf50fa6e09bedfe317f088de50fc08 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 5 00:58:01 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 5 01:02:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=46324633 |
| 7 |
|
| 8 |
einstall: borrow src_install code for Makefile test |
| 9 |
|
| 10 |
This fixes the following error when 2 files exist: |
| 11 |
|
| 12 |
$ [ -f ./[mM]akefile ] |
| 13 |
bash: [: ./makefile: binary operator expected |
| 14 |
|
| 15 |
Reported-by: R0b0t1 <r030t1 <AT> gmail.com> |
| 16 |
See: https://github.com/gentoo/portage/pull/251 |
| 17 |
|
| 18 |
bin/phase-helpers.sh | 2 +- |
| 19 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
| 22 |
index 9b1f6adbe..23cf80b39 100644 |
| 23 |
--- a/bin/phase-helpers.sh |
| 24 |
+++ b/bin/phase-helpers.sh |
| 25 |
@@ -696,7 +696,7 @@ einstall() { |
| 26 |
unset EI_DESTLIBDIR |
| 27 |
fi |
| 28 |
|
| 29 |
- if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then |
| 30 |
+ if [[ -f Makefile || -f GNUmakefile || -f makefile ]] ; then |
| 31 |
if [ "${PORTAGE_DEBUG}" == "1" ]; then |
| 32 |
${MAKE:-make} -n prefix="${ED}usr" \ |
| 33 |
datadir="${ED}usr/share" \ |
Archives