Avoid illegal dash (-) in cpp architecture defines. Patch from Colin Watson.

Makefile

@@ -371,7 +371,7 @@ endif
 		| tr ' ' '\n' >>$(BDIR)/rawlist; \
 	fi
 	$(Q)perl -npe 's/\@ARCH\@/$(ARCH)/g' $(TASK) | \
-	 cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(ARCH) \
+	 cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(subst -,_,$(ARCH)) \
 	     -U $(ARCH) -U i386 -U linux -U unix \
 	     -DFORCENONUSONCD1=$(forcenonusoncd1) \
 	     -I $(BASEDIR)/tasks -I $(BDIR) - - >> $(BDIR)/rawlist
@@ -380,7 +380,7 @@ endif
 $(BDIR)/rawlist-exclude:
 	$(Q)if [ -n "$(EXCLUDE)" ]; then \
 	 	perl -npe 's/\@ARCH\@/$(ARCH)/g' $(EXCLUDE) | \
-			cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(ARCH) \
+			cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(subst -,_,$(ARCH)) \
 				-U $(ARCH) -U i386 -U linux -U unix \
 	     			-DFORCENONUSONCD1=$(forcenonusoncd1) \
 	     			-I $(BASEDIR)/tasks -I $(BDIR) - - >> $(BDIR)/rawlist-exclude; \

debian/changelog

@@ -72,6 +72,8 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
     - Make it possible to change which images to build using CONF.sh.
     - Use DI_CODENAME to locate the installation system.  This make it
       possible to use debian-installer with Woody CDs.
+    - Avoid illegal dash (-) in cpp architecture defines.  Patch
+      from Colin Watson.
   * Stephen R. Marenka
     - Update m68k support for sarge.
         - Fix m68k/amiga icons.

tools/generate_di_list

@@ -20,7 +20,8 @@ EOF
 my @common_excludes = read_exclude("exclude-udebs");
 
 foreach my $arch (@ARCHES) {
-	print OUT "#ifdef ARCH_$arch\n";
+	(my $cpparch = $arch) =~ s/-/_/g;
+	print OUT "#ifdef ARCH_$cpparch\n";
 	my @exclude = @common_excludes;
 	push @exclude, read_exclude("exclude-udebs-$arch")
 		if -e exclude_path("exclude-udebs-$arch");
@@ -33,7 +34,7 @@ UDEB:	foreach my $udeb (map { chomp; $_ } `grep-dctrl -n -s Package '' $packagef
 		}
 		print OUT "$udeb\n";
 	}
-	print OUT "#endif /* ARCH_$arch */\n";
+	print OUT "#endif /* ARCH_$cpparch */\n";
 }
 
 sub read_exclude {