From 983c22cbab553a9c39b55112724743d12f8bffbc Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Fri, 13 Aug 1999 15:35:37 +0000
Subject: [PATCH]   * UPX -> UPXPROG, because upx 0.80+ use the environment
 itself

---
 base/makefile.fpc | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/base/makefile.fpc b/base/makefile.fpc
index b7972199ec..0defb72d63 100644
--- a/base/makefile.fpc
+++ b/base/makefile.fpc
@@ -276,23 +276,24 @@ export SED:=$(firstword $(SED))
 endif
 endif
 
-# Look if UPX is found for go32v2 and win32
-ifndef UPX
+# Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
+# upx uses that one itself (PFV)
+ifndef UPXPROG
 ifeq ($(OS_TARGET),go32v2)
-UPX=1
+UPXPROG=1
 endif
 ifeq ($(OS_TARGET),win32)
-UPX=1
+UPXPROG=1
 endif
-ifdef UPX
-UPX=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
+ifdef UPXPROG
+UPXPROG=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(UPX),)
-UPX=
+UPXPROG=
 else
-export UPX:=$(firstword $(UPX))
+export UPXPROG:=$(firstword $(UPX))
 endif
 else
-UPX=
+UPXPROG=
 endif
 endif
 
@@ -764,8 +765,8 @@ ifndef DEFAULTUNITS
 ifdef EXEOBJECTS
 	$(MKDIR) $(BININSTALLDIR)
 # Compress the exes if upx is defined
-ifdef UPX
-	-$(UPX) $(EXEFILES)
+ifdef UPXPROG
+	-$(UPXPROG) $(EXEFILES)
 endif
 	$(INSTALLEXE) $(EXEFILES) $(BININSTALLDIR)
 endif
@@ -969,8 +970,8 @@ endif
 ifdef CMP
 	@$(ECHO)  Cmp....... $(CMP)
 endif
-ifdef UPX
-	@$(ECHO)  Upx....... $(UPX)
+ifdef UPXPROG
+	@$(ECHO)  Upx....... $(UPXPROG)
 endif
 ifdef ZIPPROG
 	@$(ECHO)  Zip....... $(ZIPPROG)
@@ -1043,7 +1044,10 @@ endif
 
 #
 # $Log$
-# Revision 1.43  1999-08-09 22:19:46  peter
+# Revision 1.44  1999-08-13 15:35:37  peter
+#   * UPX -> UPXPROG, because upx 0.80+ use the environment itself
+#
+# Revision 1.43  1999/08/09 22:19:46  peter
 #   * classes vmt changed to only positive addresses
 #   * sharedlib creation is working
 #