--- Merging r18097 into '.':

U    packages/fastcgi/Makefile.fpc
U    packages/fastcgi/Makefile
U    packages/fcl-web/Makefile.fpc
U    packages/fcl-web/Makefile

# revisions: 18097
------------------------------------------------------------------------
r18097 | joost | 2011-08-05 00:13:20 +0200 (Fri, 05 Aug 2011) | 1 line
Changed paths:
   M /trunk/packages/fastcgi/Makefile
   M /trunk/packages/fastcgi/Makefile.fpc
   M /trunk/packages/fcl-web/Makefile
   M /trunk/packages/fcl-web/Makefile.fpc

 * Do not use the error-handling of r10890 on non-unix systems (It won't work)
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@19059 -

packages/fastcgi/Makefile

@@ -2235,7 +2235,11 @@ ifeq ($(FPMAKE_BIN_CLEAN),)
 distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
 else
 distclean:	
+ifdef inUnix	
 	{ $(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;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
 	-$(DEL) $(LOCALFPMAKE)
 endif
 install:	fpmake

packages/fastcgi/Makefile.fpc

@@ -51,7 +51,11 @@ ifeq ($(FPMAKE_BIN_CLEAN),)
 distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
 else
 distclean:	
+ifdef inUnix	
         { $(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;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
 	-$(DEL) $(LOCALFPMAKE)
 endif
 install:	fpmake

packages/fcl-web/Makefile

@@ -2235,7 +2235,11 @@ ifeq ($(FPMAKE_BIN_CLEAN),)
 distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
 else
 distclean:	
+ifdef inUnix	
 	{ $(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;  }
+else
+	$(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
 	-$(DEL) $(LOCALFPMAKE)
 endif
 install:	fpmake

packages/fcl-web/Makefile.fpc

@@ -52,6 +52,9 @@ distclean:	$(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
 else
 distclean:	
         { $(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;  }
+else
+        $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
+endif
 	-$(DEL) $(LOCALFPMAKE)
 endif
 install:	fpmake