diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2018-02-04 16:58:01 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2018-02-04 17:02:38 -0800 |
| commit | 46324633cbcf50fa6e09bedfe317f088de50fc08 (patch) | |
| tree | 2b8a34e911adafad03bdfd200313c169400ecefb | |
| parent | Updates for portage-2.3.24 release (diff) | |
| download | portage-46324633.tar.gz portage-46324633.tar.bz2 portage-46324633.zip | |
einstall: borrow src_install code for Makefile test
This fixes the following error when 2 files exist:
$ [ -f ./[mM]akefile ]
bash: [: ./makefile: binary operator expected
Reported-by: R0b0t1 <r030t1@gmail.com>
See: https://github.com/gentoo/portage/pull/251
| -rw-r--r-- | bin/phase-helpers.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 9b1f6adbe..23cf80b39 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -696,7 +696,7 @@ einstall() { unset EI_DESTLIBDIR fi - if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then + if [[ -f Makefile || -f GNUmakefile || -f makefile ]] ; then if [ "${PORTAGE_DEBUG}" == "1" ]; then ${MAKE:-make} -n prefix="${ED}usr" \ datadir="${ED}usr/share" \ |