| 1 |
commit: f6c347f5ac192715a666e14f617b61524f9445ac |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 28 14:52:37 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 5 08:33:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f6c347f5 |
| 7 |
|
| 8 |
do not try to install files when there are none |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
bin/Makefile.in | 2 ++ |
| 13 |
pym/Makefile.in | 2 ++ |
| 14 |
2 files changed, 4 insertions(+) |
| 15 |
|
| 16 |
diff --git a/bin/Makefile.in b/bin/Makefile.in |
| 17 |
index 4ec94213e..afff11dfb 100644 |
| 18 |
--- a/bin/Makefile.in |
| 19 |
+++ b/bin/Makefile.in |
| 20 |
@@ -41,6 +41,7 @@ install: |
| 21 |
$(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" $(DESTDIR)$(PORTAGE_BIN) |
| 22 |
( cd "$(srcdir)" && find . -type d ) | while read f ; do \ |
| 23 |
files=( ) ; \ |
| 24 |
+ shopt -s nullglob ; \ |
| 25 |
for t in "$(srcdir)/$${f}"/* ; do \ |
| 26 |
[[ -d $${t} ]] && continue ; \ |
| 27 |
[[ $${t} == */Makefile* ]] && continue ; \ |
| 28 |
@@ -49,6 +50,7 @@ install: |
| 29 |
$(INSTALL) -d -m 755 \ |
| 30 |
-o "$(portageuser)" -g "$(portagegroup)" \ |
| 31 |
"$(DESTDIR)$(PORTAGE_BIN)/$${f}" && \ |
| 32 |
+ [[ $${files[0]} ]] || continue ; \ |
| 33 |
$(INSTALL_subst) -m 755 \ |
| 34 |
-o "$(portageuser)" -g "$(portagegroup)" \ |
| 35 |
-t "$(DESTDIR)$(PORTAGE_BIN)/$${f}" \ |
| 36 |
|
| 37 |
diff --git a/pym/Makefile.in b/pym/Makefile.in |
| 38 |
index dad4ed393..a32b219d6 100644 |
| 39 |
--- a/pym/Makefile.in |
| 40 |
+++ b/pym/Makefile.in |
| 41 |
@@ -22,6 +22,7 @@ install: |
| 42 |
$(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" $(DESTDIR)$(PORTAGE_PYM) |
| 43 |
( cd "$(srcdir)" && find * -type d ) | while read f ; do \ |
| 44 |
files=( ) ; \ |
| 45 |
+ shopt -s nullglob ; \ |
| 46 |
for t in "$(srcdir)/$${f}"/* ; do \ |
| 47 |
[[ -d $${t} ]] && continue ; \ |
| 48 |
[[ $${t} == */Makefile* ]] && continue ; \ |
| 49 |
@@ -30,6 +31,7 @@ install: |
| 50 |
$(INSTALL) -d -m 755 \ |
| 51 |
-o "$(portageuser)" -g "$(portagegroup)" \ |
| 52 |
"$(DESTDIR)$(PORTAGE_PYM)/$${f}" && \ |
| 53 |
+ [[ $${files[0]} ]] || continue ; \ |
| 54 |
$(INSTALL_subst) \ |
| 55 |
-o "$(portageuser)" -g "$(portagegroup)" \ |
| 56 |
-t "$(DESTDIR)$(PORTAGE_PYM)/$${f}" \ |
Archives