Author: Andreas Tille <tille@debian.org>
Description: Fix various clean targets

--- a/ARBDB2/Makefile
+++ b/ARBDB2/Makefile
@@ -1,7 +1,11 @@
 # INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
 .SUFFIXES: .o .c .depend
 
-include AD_MOBJECTS.h
+HeaderFile = AD_MOBJECTS.h
+CheckHEADER := $(shell if [ -e $(HeaderFile) ] ; then echo 1 ; else echo 0 ; fi)
+ifeq ($(CheckHEADER),1)
+    include $(HeaderFile)
+endif
 
 ACC_OBJECTS = $(GB_O) $(GB_T) $(GB_X)
 
--- a/ARBDBS/Makefile
+++ b/ARBDBS/Makefile
@@ -1,7 +1,11 @@
 # INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
 .SUFFIXES: .o .c .cxx .depend
 
-include AD_MOBJECTS.h
+HeaderFile = AD_MOBJECTS.h
+CheckHEADER := $(shell if [ -e $(HeaderFile) ] ; then echo 1 ; else echo 0 ; fi)
+ifeq ($(CheckHEADER),1)
+    include $(HeaderFile)
+endif
 
 
 OBJECTS = $(GB_O) $(GB_T) $(GB_PP) $(GB_X)
--- a/NAMES_COM/Makefile
+++ b/NAMES_COM/Makefile
@@ -18,7 +18,7 @@ CLIENTCOMPILER = $(COMPILER)
 AISC_COMPILER=../MAKEBIN/aisc
 AISC_DEPENDS = $(wildcard AISC/*.pa) $(AISC_COMPILER)
 
-include AISC/export2sub
+include $(ARBHOME)/AISC_COM//AISC/export2sub
 
 server.a: $(MAIN_SOURCE) $(PRIVATE_SERVER_OBJECTS:.o=.c) $(PUBLIC_SOURCES) $(AISC_DEPENDS)
 	@$(MAKE) -r -f AISC/Makefile
@@ -27,7 +27,7 @@ depends:
 	@$(MAKE) -r -f AISC/Makefile pregenerate
 
 clean:
-	@$(MAKE) -r -f AISC/Makefile clean
+	@$(MAKE) -r -f ../AISC/Makefile clean
 
 # DO NOT DELETE
 
--- a/PROBE_COM/Makefile
+++ b/PROBE_COM/Makefile
@@ -18,7 +18,7 @@ CLIENTCOMPILER := $(COMPILER)
 AISC_COMPILER=../MAKEBIN/aisc
 AISC_DEPENDS = $(wildcard AISC/*.pa) $(AISC_COMPILER)
 
-include AISC/export2sub
+include $(ARBHOME)/AISC_COM//AISC/export2sub
 
 server.a:	$(MAIN_SOURCE)	$(PRIVATE_SERVER_OBJECTS:.o=.c) $(PUBLIC_SOURCES) $(AISC_DEPENDS)
 		@$(MAKE) -r -f AISC/Makefile
@@ -27,7 +27,7 @@ depends:
 		@$(MAKE) -r -f AISC/Makefile pregenerate
 
 clean:
-		@$(MAKE) -r -f AISC/Makefile clean
+		@$(MAKE) -r -f ../AISC/Makefile clean
 
 # DO NOT DELETE
 
--- a/GENOM_IMPORT/Makefile
+++ b/GENOM_IMPORT/Makefile
@@ -30,12 +30,12 @@ $(MAIN): $(CPP_OBJECTS)
 	$(ACC) $(cflags) -c $< $(CPPINCLUDES)
 
 clean:
-	-rm *.o
-	-rm *.a
-	-rm *.bak
-	-rm *~
-	-rm *#
-	-rm *\%
+	-rm -f *.o
+	-rm -f *.a
+	-rm -f *.bak
+	-rm -f *~
+	-rm -f *#
+	-rm -f *\%
 
 #.IGNORE:
 #	clean
--- a/HELP_SOURCE/Makefile
+++ b/HELP_SOURCE/Makefile
@@ -151,7 +151,7 @@ $(HLP_DEST)/%.pdf.gz : $(HLP_SOURCE)/%.p
 # --------------------------------------------------------------------------------
 
 delzerohtml:
-		-find $(HTML_LOCATION) -name "*.html" -size -1 -exec rm {} \;
+		-if [ -d $(HTML_LOCATION) ] ; then find $(HTML_LOCATION) -name "*.html" -size -1 -exec rm {} \; ; fi
 
 date :
 	$(MAKE) date.xsl.tmp
--- a/GDEHELP/Makefile.helpfiles
+++ b/GDEHELP/Makefile.helpfiles
@@ -2,9 +2,9 @@
 
 .SUFFIXES: .doc .help .html
 
-# GENHELPDEST, GENDOCDEST and HELPFILELIST are passed from 'Makefile'
+# GENHELPDEST, GENDOCDEST and HELP_NAMES are passed from 'Makefile'
 
-HELP_NAMES=$(shell cat $(HELPFILELIST))
+# HELP_NAMES=$(shell cat $(HELPFILELIST))
 HELP_TARGETS=$(addprefix $(GENHELPDEST)/,$(HELP_NAMES))
 HELP_PLAIN=./HELP_PLAIN
 HELP_WRITTEN=./HELP_WRITTEN
--- a/GDEHELP/Makefile
+++ b/GDEHELP/Makefile
@@ -47,11 +47,19 @@ save:
 	tar cvf - MENUS ARB_GDEmenus* |gzip >`date '+arbgdemnus_%d_%m_%y.tar.gz'`
 
 clean:
-	rm -f $(GENMENUS) $(MENUS) $(HELPFILELIST)
-	@$(MAKE) -f Makefile.helpfiles \
-		"GENHELPDEST=$(GENHELPDEST)" \
-		"GENDOCDEST=$(GENDOCDEST)" \
-		"HELPFILELIST=$(HELPFILELIST)" \
-		clean
-	rm -f $(GENMENUS) $(MENUS) $(HELPFILELIST)
+	rm -f $(GENMENUS) $(MENUS)
+	@if [ -e $(HELPFILELIST) ] ; then \
+		$(MAKE) -f Makefile.helpfiles \
+			"GENHELPDEST=$(GENHELPDEST)" \
+			"GENDOCDEST=$(GENDOCDEST)" \
+			"HELPFILELIST=$(HELPFILELIST)" \
+			clean ; \
+	else \
+		$(MAKE) -f Makefile.helpfiles \
+			"GENHELPDEST=$(GENHELPDEST)" \
+			"GENDOCDEST=$(GENDOCDEST)" \
+			"HELPFILELIST=$(HELPFILELIST)" \
+			clean ; \
+	fi
+	rm -f $(HELPFILELIST)
 
