new grsix "lungs" and "breast"; support for them; and fix fix-makefile
@@ -550,7 +550,7 @@ | ||
550 | 550 | $(call pfms,$(1)),$(if $(wildcard ./mp/$(call pfms,$(1))-$(term).mp),\ |
551 | 551 | $(call pfms,$(1)),$(DEFAULT_TOK)))-$(term).mp) |
552 | 552 | |
553 | -KANJIPAGES:=$(strip 2e 2f 4e 4f $(foreach hinib,5 6 7 8 9,\ | |
553 | +KANJIPAGES:=$(strip 2e 2f 34 35 4e 4f $(foreach hinib,5 6 7 8 9,\ | |
554 | 554 | $(foreach lonib,0 1 2 3 4 5 6 7 8 9 a b c d e f,$(hinib)$(lonib) )) f9) |
555 | 555 | |
556 | 556 | PAGEFILES=$(strip $(foreach page,\ |
@@ -41,7 +41,7 @@ | ||
41 | 41 | # This macro is released to the public domain by its author, |
42 | 42 | # Matthew Skala <mskala@ansuz.sooke.bc.ca>. |
43 | 43 | |
44 | -#serial 1 | |
44 | +#serial 2 | |
45 | 45 | |
46 | 46 | AC_DEFUN([TSU_FIX_MAKEFILE], [ |
47 | 47 | AC_CONFIG_COMMANDS([fix-makefile], |
@@ -63,6 +63,10 @@ | ||
63 | 63 | s#config\.status \$\@ \$\(am__depfiles_maybe\)#dnl |
64 | 64 | config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;dnl |
65 | 65 | dnl |
66 | +dnl Current Automake uses a different variable name; hit that one too | |
67 | +s#config\.status \$\@ \$\(am__maybe_remake_depfiles\)#dnl | |
68 | +config.status \$\@ fix-makefile \$(am__maybe_remake_depfiles)#;dnl | |
69 | +dnl | |
66 | 70 | dnl Change lines that look like Automake's "make clean" recipes, to |
67 | 71 | dnl use our pretty output format. |
68 | 72 | s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#dnl |
@@ -41,7 +41,7 @@ | ||
41 | 41 | # This macro is released to the public domain by its author, |
42 | 42 | # Matthew Skala <mskala@ansuz.sooke.bc.ca>. |
43 | 43 | |
44 | -#serial 1 | |
44 | +#serial 2 | |
45 | 45 | |
46 | 46 | AC_DEFUN([TSU_FIX_MAKEFILE], [ |
47 | 47 | AC_CONFIG_COMMANDS([fix-makefile], |
@@ -63,6 +63,10 @@ | ||
63 | 63 | s#config\.status \$\@ \$\(am__depfiles_maybe\)#dnl |
64 | 64 | config.status \$\@ fix-makefile \$(am__depfiles_maybe)#;dnl |
65 | 65 | dnl |
66 | +dnl Current Automake uses a different variable name; hit that one too | |
67 | +s#config\.status \$\@ \$\(am__maybe_remake_depfiles\)#dnl | |
68 | +config.status \$\@ fix-makefile \$(am__maybe_remake_depfiles)#;dnl | |
69 | +dnl | |
66 | 70 | dnl Change lines that look like Automake's "make clean" recipes, to |
67 | 71 | dnl use our pretty output format. |
68 | 72 | s#\t-\@?(test -z.* || )?rm -(r?)f (.*)#dnl |