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

* don't override pasext if set

Browse Source
This commit is contained in:
peter 1999-04-01 22:52:28 +00:00
parent 05bca62add
commit 347a146da3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/makefile.fpc
View File

@ -621,17 +621,18 @@ LIBPREFIX=
endif endif
# determine which .pas extension is used # determine which .pas extension is used
ifndef PASEXT
ifdef EXEOBJECTS ifdef EXEOBJECTS
override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(EXEOBJECTS))))) override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(EXEOBJECTS)))))
else else
override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(UNITOBJECTS))))) override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(UNITOBJECTS)))))
endif endif
ifeq ($(TESTPAS),) ifeq ($(TESTPAS),)
PASEXT=.pp PASEXT=.pp
else else
PASEXT=.pas PASEXT=.pas
endif endif
endif
# also call ppas if with command option -s # also call ppas if with command option -s
ifeq (,$(findstring -s ,$(COMPILER))) ifeq (,$(findstring -s ,$(COMPILER)))
@ -961,7 +962,10 @@ endif
# #
# $Log$ # $Log$
# Revision 1.12 1999-03-29 16:04:58 peter # Revision 1.13 1999-04-01 22:52:28 peter
# * don't override pasext if set
#
# Revision 1.12 1999/03/29 16:04:58 peter
# * place -T as the first parameter on the commandline so a OPT=-A can # * place -T as the first parameter on the commandline so a OPT=-A can
# overwrite it # overwrite it
# #