paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 11:09:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

* UPX -> UPXPROG, because upx 0.80+ use the environment itself

Browse Source
This commit is contained in:
peter 1999-08-13 15:35:37 +00:00
parent 8b4c7f2402
commit 983c22cbab
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
base/makefile.fpc
View File

@ -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
#