mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-20 15:49:27 +02:00
remove nostop before ide build
This commit is contained in:
parent
d45dea5db8
commit
e9cebe5dec
11
Makefile
11
Makefile
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
|
||||
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/06]
|
||||
#
|
||||
default: help
|
||||
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
|
||||
@ -280,11 +280,6 @@ ALLTARGET=all
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifdef SNAPSHOT
|
||||
NOSTOP=-
|
||||
else
|
||||
NOSTOP=
|
||||
endif
|
||||
PKGUNITSPRELONGTARGETS=linux freebsd netbsd openbsd
|
||||
ifneq ($(findstring $(OS_TARGET),$(PKGUNITSPRELONGTARGETS)),)
|
||||
PKGUNITSPRE=units
|
||||
@ -2198,7 +2193,7 @@ install: $(BUILDSTAMP)
|
||||
$(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS)
|
||||
$(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
|
||||
ifdef IDE
|
||||
$(NOSTOP)$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
|
||||
$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
|
||||
endif
|
||||
zipinstall: $(BUILDSTAMP)
|
||||
$(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=$(PKGPRE)base$(ZIPSUFFIX) $(INSTALLOPTS)
|
||||
@ -2206,7 +2201,7 @@ zipinstall: $(BUILDSTAMP)
|
||||
$(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
|
||||
$(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)util$(ZIPSUFFIX)
|
||||
ifdef IDE
|
||||
$(NOSTOP)$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
|
||||
$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
|
||||
endif
|
||||
singlezipinstall: $(BUILDSTAMP)
|
||||
$(MAKE) fpc_zipinstall ZIPTARGET=install ZIPNAME=fpc-$(FULL_TARGET) $(INSTALLOPTS)
|
||||
|
11
Makefile.fpc
11
Makefile.fpc
@ -90,13 +90,6 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
# Stop with an error?
|
||||
ifdef SNAPSHOT
|
||||
NOSTOP=-
|
||||
else
|
||||
NOSTOP=
|
||||
endif
|
||||
|
||||
# Prefix for units
|
||||
PKGUNITSPRELONGTARGETS=linux freebsd netbsd openbsd
|
||||
ifneq ($(findstring $(OS_TARGET),$(PKGUNITSPRELONGTARGETS)),)
|
||||
@ -324,7 +317,7 @@ install: $(BUILDSTAMP)
|
||||
$(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS)
|
||||
$(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
|
||||
ifdef IDE
|
||||
$(NOSTOP)$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
|
||||
$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
|
||||
endif
|
||||
|
||||
zipinstall: $(BUILDSTAMP)
|
||||
@ -333,7 +326,7 @@ zipinstall: $(BUILDSTAMP)
|
||||
$(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
|
||||
$(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)util$(ZIPSUFFIX)
|
||||
ifdef IDE
|
||||
$(NOSTOP)$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
|
||||
$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
|
||||
endif
|
||||
|
||||
singlezipinstall: $(BUILDSTAMP)
|
||||
|
Loading…
Reference in New Issue
Block a user