From c27b7e52e16a533b8e4efa1a432489546378fd92 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Sat, 24 Sep 2016 13:49:07 +0200
Subject: [PATCH] Small Makefile update.

---
 Makefile          | 7 ++++---
 src/Makefile      | 2 ++
 src/stub/Makefile | 6 ++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index effed432..50040bfa 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,12 @@ top_srcdir = .
 include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 
 
-# info: src/stub needs special build tools
+# info: src/stub needs special build tools from https://github.com/upx/upx-stubtools
 BUILD_STUB = 0
-ifneq ($(wildcard $(HOME)/local/bin/bin-upx/.),)
+ifneq ($(wildcard $(HOME)/local/bin/bin-upx/upx-stubtools-check-version),)
 BUILD_STUB = 1
 endif
-ifneq ($(wildcard $(HOME)/bin/bin-upx/.),)
+ifneq ($(wildcard $(HOME)/bin/bin-upx/upx-stubtools-check-version),)
 BUILD_STUB = 1
 endif
 
@@ -40,3 +40,4 @@ endif
 
 .PHONY: default all mostlyclean clean distclean maintainer-clean
 
+# vim:set ts=8 sw=8 noet:
diff --git a/src/Makefile b/src/Makefile
index c801897b..bed6b030 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -131,3 +131,5 @@ CLANG_FORMAT_FILES += ui.cpp ui.h util.h
 clang-format:
 	$(top_srcdir)/src/stub/scripts/upx-clang-format -i $(addprefix $(top_srcdir)/src/,$(CLANG_FORMAT_FILES))
 .PHONY: clang-format
+
+# vim:set ts=8 sw=8 noet:
diff --git a/src/stub/Makefile b/src/stub/Makefile
index 0c9193de..2ec8ffe8 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -35,10 +35,10 @@ endif
 include $(wildcard $(top_srcdir)/Makevars.global ./Makevars.local)
 
 # update $PATH for our special stub build tools
-ifneq ($(wildcard $(HOME)/local/bin/bin-upx/.),)
+ifneq ($(wildcard $(HOME)/local/bin/bin-upx/upx-stubtools-check-version),)
 export PATH := $(HOME)/local/bin/bin-upx:$(PATH)
 endif
-ifneq ($(wildcard $(HOME)/bin/bin-upx/.),)
+ifneq ($(wildcard $(HOME)/bin/bin-upx/upx-stubtools-check-version),)
 export PATH := $(HOME)/bin/bin-upx:$(PATH)
 endif
 
@@ -1317,9 +1317,7 @@ powerpc64le-darwin.macho-entry.h : $(srcdir)/src/$$T.S
 	$(call tc,bin2h) tmp/$T.bin $@
 
 powerpc64le-darwin.macho-fold.h : tmp/$$T.o tmp/powerpc64le-darwin.macho-main.o
-# FIXME: undefined reference to `_savegpr0_28' etc.
 	$(call tc,ld) --no-warn-mismatch --strip-all --oformat binary -Map tmp/$T.map $(filter %.o,$^) -o tmp/$T.bin
-#	echo "FIXME" > tmp/$T.bin
 	chmod a-x tmp/$T.bin
 	$(call tc,bin2h) tmp/$T.bin $@