X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fscowl.git;a=blobdiff_plain;f=debian%2Frules;fp=debian%2Frules;h=50e46ca86eb5cba44099778f4ba42bed81579fe9;hp=a66c8e79a9084816f8ec87f2c99b212fd34f13bc;hb=7dd9abc19ec49c2719bc7c38cac3948a997c836f;hpb=83d402ced70d29ed6c78e281d56621cd4603466f

diff --git a/debian/rules b/debian/rules
index a66c8e7..50e46ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,17 +55,34 @@ build-stamp:
 		  echo "  english-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
 		fi;\
 		for VARIANT in $(VARIANTS); do\
-		  if [ -f final/variant_$$VARIANT-$$CLASS.$$EXT ]; then\
-		    echo "cat final/variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
-		    cat final/variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
-		    echo "  variant_$$VARIANT-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+		  VARIANT_FILE="$${SPELLING}_"; \
+		  if [ "$$VARIANT_FILE" = "american_" ]; then \
+			VARIANT_FILE=""; \
+		  fi; \
+		  if [ -f final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT ]; then\
+		    echo "cat final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
+		    cat final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
+		    echo "  $${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
 		  fi;\
 		done;\
 		if [ "$$SIZE" = "insane" ]; then\
-		  for special in special_hacker.50; do \
-		    echo "cat final/$$special >> $$SPELLING-english$$SIZE.unsorted";\
-		    cat final/final/$$special >> $$SPELLING-english$$SIZE.unsorted;\
-		    echo "  final/$$special" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+		  for VARIANT in $(VARIANTS); do\
+		    for VARIANT_FILE in $(SPELLINGS); do \
+		      VARIANT_FILE="$${VARIANT_FILE}_"; \
+		      if [ "$$VARIANT_FILE" = "american_" ]; then \
+		   	VARIANT_FILE=""; \
+		      fi; \
+		      if [ -f final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT ]; then\
+		        echo "cat final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
+		        cat final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
+		        echo "  $${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+		      fi;\
+		    done; \
+                  done; \
+		  for special in final/special_*.$$CLASS; do \
+		    echo "cat $$special >> $$SPELLING-english$$SIZE.unsorted";\
+		    cat $$special >> $$SPELLING-english$$SIZE.unsorted;\
+		    echo "  $$special" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
 		  done;\
 		fi;\
 		if [ -f final/$$SPELLING-$$CLASS.$$EXT ]; then\