From 37761d580f7af4dd3c89fad42bce169b6ad0ec0a Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Wed, 23 Aug 2006 13:11:01 +0200
Subject: [PATCH] Updated for bin-upx-20060823.

---
 doc/Makefile      |  8 ++++++++
 src/stub/Makefile | 11 ++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 094c7452..c5b61901 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -2,6 +2,14 @@ MAKEFLAGS += -rR
 .SUFFIXES:
 SHELL = /bin/sh
 
+# update $PATH for our special stub build tools
+ifneq ($(wildcard $(HOME)/local/bin/bin-upx/.),)
+export PATH := $(HOME)/local/bin/bin-upx:$(PATH)
+endif
+ifneq ($(wildcard $(HOME)/bin/bin-upx/.),)
+export PATH := $(HOME)/bin/bin-upx:$(PATH)
+endif
+
 top_srcdir = ..
 
 PACKAGE       = upx
diff --git a/src/stub/Makefile b/src/stub/Makefile
index 20d3fb4b..ef24f4bb 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -94,14 +94,14 @@ endif
 
 all.targets ?= .upx-stubtools-stamp tmp/.tmp-stamp .all-stamp
 all: $$(all.targets)
+.upx-stubtools-stamp: $(MAKEFILE_LIST)
+	upx-stubtools-check-version 20060823
+	@echo "timestamp" > $@
 tmp/.tmp-stamp:
 	@mkdir -p $(dir $@)
 	@echo "timestamp" > $@
 .all-stamp: $$(STUBS)
 	@echo "timestamp" > $@
-.upx-stubtools-stamp: $(MAKEFILE_LIST)
-	upx-stubtools-check-version 20060816
-	@echo "timestamp" > $@
 
 ifeq ($(wildcard .all-stamp),)
 mostlyclean clean: distclean
@@ -112,8 +112,9 @@ distclean:
 	rm -f .*-stamp
 	rm -rf tmp
 maintainer-clean:
-	rm -f $(STUBS)
+	rm -f .upx-stubtools-stamp
 	rm -rf tmp
+	rm -f $(STUBS)
 
 .PHONY: default all mostlyclean clean distclean maintainer-clean
 
@@ -628,7 +629,7 @@ mipsel.r3000-ps1.h : tc_bfdname = elf32-littlemips
 
 tc.mipsel.r3000-ps1.as   = mipsel-elf-as-20060406 -O -mno-pdr
 ##tc.mipsel.r3000-ps1.as   = mipsel-linux-as-2.16.1 -O -mno-pdr
-tc.mipsel.r3000-ps1.gcc  = mipsel-linux-gcc-4.1.1 -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD -MT $@
+tc.mipsel.r3000-ps1.gcc  = mipsel-linux-gcc-4.1.1 -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD -MT $@
 tc.mipsel.r3000-ps1.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
 tc.mipsel.r3000-ps1.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror