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

* Error-handling added in make distclean. When the fpmake executable

Browse Source 
returns a exit-code not equal to 0, the executble is removed and
   make fpc_cleanall is called recursively, to avoid manual intervention

git-svn-id: trunk@18090 -
This commit is contained in:
joost 2011-08-04 08:49:46 +00:00
parent 3ffbd29367
commit 728c5a4832
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/fastcgi/Makefile
View File

@ -2235,7 +2235,7 @@ ifeq ($(FPMAKE_BIN_CLEAN),)
distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
else else
distclean: distclean:
$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
-$(DEL) $(LOCALFPMAKE) -$(DEL) $(LOCALFPMAKE)
endif endif
install: fpmake install: fpmake

2
packages/fastcgi/Makefile.fpc
View File

@ -51,7 +51,7 @@ ifeq ($(FPMAKE_BIN_CLEAN),)
distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
else else
distclean: distclean:
$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
-$(DEL) $(LOCALFPMAKE) -$(DEL) $(LOCALFPMAKE)
endif endif
install: fpmake install: fpmake

2
packages/fcl-web/Makefile
View File

@ -2235,7 +2235,7 @@ ifeq ($(FPMAKE_BIN_CLEAN),)
distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
else else
distclean: distclean:
$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
-$(DEL) $(LOCALFPMAKE) -$(DEL) $(LOCALFPMAKE)
endif endif
install: fpmake install: fpmake

2
packages/fcl-web/Makefile.fpc
View File

@ -51,7 +51,7 @@ ifeq ($(FPMAKE_BIN_CLEAN),)
distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
else else
distclean: distclean:
$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
-$(DEL) $(LOCALFPMAKE) -$(DEL) $(LOCALFPMAKE)
endif endif
install: fpmake install: fpmake