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

* ECHO is now again without @

Browse Source
This commit is contained in:
peter 1999-07-17 14:22:54 +00:00
parent c8dddab319
commit c7b4ceb06a
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
base/makefile.fpc
View File

@ -245,9 +245,9 @@ endif
ifndef ECHO ifndef ECHO
ECHO=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ECHO=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
ifeq ($(ECHO),) ifeq ($(ECHO),)
ECHO=@echo export ECHO:=echo
else else
export ECHO:=@$(firstword $(ECHO)) export ECHO:=$(firstword $(ECHO))
endif endif
endif endif
@ -625,7 +625,7 @@ endif
ifdef DATE ifdef DATE
DATESTR=$(shell $(DATE) +%Y%m%d) DATESTR=$(shell $(DATE) +%Y%m%d)
else else
DATESTR= DATESTR=
endif endif
@ -749,10 +749,10 @@ ifdef LOADEROBJECTS
endif endif
ifdef UNITOBJECTS ifdef UNITOBJECTS
$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES))) $(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES)))
endif endif
ifdef EXTRAINSTALLUNITS ifdef EXTRAINSTALLUNITS
$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(wildcard $(addsuffix $(OEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS)))) $(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(wildcard $(addsuffix $(OEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))))
endif endif
fpc_install : all fpc_install : all
# Create UnitInstallFiles # Create UnitInstallFiles
@ -776,7 +776,7 @@ endif
ifdef UNITOBJECTS ifdef UNITOBJECTS
$(MKDIR) $(UNITINSTALLDIR) $(MKDIR) $(UNITINSTALLDIR)
$(INSTALL) $(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES)) $(UNITINSTALLDIR) $(INSTALL) $(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES)) $(UNITINSTALLDIR)
endif endif
ifdef EXTRAINSTALLUNITS ifdef EXTRAINSTALLUNITS
$(MKDIR) $(UNITINSTALLDIR) $(MKDIR) $(UNITINSTALLDIR)
$(INSTALL) $(wildcard $(addsuffix $(OEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))) $(UNITINSTALLDIR) $(INSTALL) $(wildcard $(addsuffix $(OEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))) $(UNITINSTALLDIR)
@ -883,10 +883,10 @@ ifdef LOADEROBJECTS
endif endif
ifdef UNITOBJECTS ifdef UNITOBJECTS
-$(DEL) $(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES)) -$(DEL) $(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES))
endif endif
ifdef EXTRACLEANUNITS ifdef EXTRACLEANUNITS
-$(DEL) $(wildcard $(addsuffix $(OEXT),$(EXTRACLEANUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRACLEANUNITS)) $(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))) -$(DEL) $(wildcard $(addsuffix $(OEXT),$(EXTRACLEANUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRACLEANUNITS)) $(addsuffix $(PPUEXT),$(EXTRACLEANUNITS)))
endif endif
-$(DEL) $(PPAS) link.res log -$(DEL) $(PPAS) link.res log
fpc_libsclean: clean fpc_libsclean: clean
@ -1009,7 +1009,7 @@ fpc_installinfo:
@$(ECHO) MsgInstallDir........ $(MSGINSTALLDIR) @$(ECHO) MsgInstallDir........ $(MSGINSTALLDIR)
@$(ECHO) DocInstallDir........ $(DOCINSTALLDIR) @$(ECHO) DocInstallDir........ $(DOCINSTALLDIR)
@$(ECHO) @$(ECHO)
# try to get the files in the currentdir # try to get the files in the currentdir
PASFILES:=$(wildcard *.pas) PASFILES:=$(wildcard *.pas)
PPFILES:=$(wildcard *.pp) PPFILES:=$(wildcard *.pp)
@ -1039,7 +1039,10 @@ endif
# #
# $Log$ # $Log$
# Revision 1.39 1999-07-17 11:30:23 peter # Revision 1.40 1999-07-17 14:22:54 peter
# * ECHO is now again without @
#
# Revision 1.39 1999/07/17 11:30:23 peter
# * merged # * merged
# #
# Revision 1.38 1999/07/16 13:45:24 peter # Revision 1.38 1999/07/16 13:45:24 peter