summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-18 16:11:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-18 16:11:06 -0400
commit92cc1eca0a53db1551c8c7646d29c65b71fced3e (patch)
treea94147d1a0aef39ee078f9d44bb5be11a403b381 /Makefile
parent9cdef1e06b4784c745e25f0c65606737df27ce2e (diff)
fix shimming code to detect executables like ssh that file(1) says are shared objects
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8d5d7b6c4..7b37c4eba 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,7 @@ linuxstandalone: Build/Standalone
# in its own separate directory, to avoid eg git looking for
# binaries in its directory rather than in PATH.
for file in $$(find "$(LINUXSTANDALONE_DEST)" -type f); do \
- if file "$$file" | grep ELF | grep -q executable; then \
+ if file "$$file" | grep ELF | egrep -q 'executable|shared object' && test -x "$$file"; then \
base=$$(basename "$$file"); \
mkdir -p "$(LINUXSTANDALONE_DEST)/shimmed/$$base"; \
mv "$$file" "$(LINUXSTANDALONE_DEST)/shimmed/$$base/"; \