diff --git a/Makefile b/Makefile index 0bb8dcf3..6f8160fc 100644 --- a/Makefile +++ b/Makefile @@ -383,9 +383,10 @@ dprint.o: lib/dconv/dprint.cpp libs: libamath libcomplex libcamath libamathapp catalogs: - ${FLXCAT} catalog/help.cd app/localize/help.h=catalog/help.sd - ${FLXCAT} catalog/ident-clean.cd app/localize/ident.h=catalog/ident.sd - ${FLXCAT} catalog/text.cd app/localize/text.h=catalog/text.sd + ${FLXCAT} text/keyword.cd app/localize/kword.h=text/keyword.sd + ${FLXCAT} text/help.cd app/localize/help.h=text/help.sd + ${FLXCAT} text/ident-clean.cd app/localize/ident.h=text/ident.sd + ${FLXCAT} text/text.cd app/localize/text.h=text/text.sd libamathapp: aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o ${AR} rcs libamathapp.a aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o @@ -410,17 +411,16 @@ dist: app ${MKDIR} dist ${MKDIR} dist/catalog ${MKDIR} dist/catalog/english - ${FLXCAT} catalog/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog - ${FLXCAT} catalog/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog - ${FLXCAT} catalog/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog + ${FLXCAT} text/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog + ${FLXCAT} text/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog + ${FLXCAT} text/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog ${MKDIR} dist/catalog/dansk - ${FLXCAT} catalog/help.cd catalog/dansk/amath-help.ct CATALOG dist/catalog/dansk/amath-help.catalog - ${FLXCAT} catalog/ident.cd catalog/dansk/amath-ident.ct CATALOG dist/catalog/dansk/amath-ident.catalog - ${FLXCAT} catalog/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog + ${FLXCAT} text/help.cd catalog/dansk/amath-help.ct CATALOG dist/catalog/dansk/amath-help.catalog + ${FLXCAT} text/ident.cd catalog/dansk/amath-ident.ct CATALOG dist/catalog/dansk/amath-ident.catalog + ${FLXCAT} text/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog ${COPY} amath dist/ ${COPY} LICENSE dist/ ${COPY} COPYRIGHT dist/ - ${COPY} catalog/README dist/catalog/ ${COPY} catalog/LICENSE dist/catalog/ clean: diff --git a/Makefile.m68k b/Makefile.m68k index 948e57ef..cdfda291 100644 --- a/Makefile.m68k +++ b/Makefile.m68k @@ -383,9 +383,10 @@ dprint.o: lib/dconv/dprint.cpp libs: libamath libcomplex libcamath libamathapp catalogs: - ${FLXCAT} catalog/help.cd app/localize/help.h=catalog/help.sd - ${FLXCAT} catalog/ident-clean.cd app/localize/ident.h=catalog/ident.sd - ${FLXCAT} catalog/text.cd app/localize/text.h=catalog/text.sd + ${FLXCAT} text/keyword.cd app/localize/kword.h=text/keyword.sd + ${FLXCAT} text/help.cd app/localize/help.h=text/help.sd + ${FLXCAT} text/ident-clean.cd app/localize/ident.h=text/ident.sd + ${FLXCAT} text/text.cd app/localize/text.h=text/text.sd libamathapp: aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o ${AR} rcs libamathapp.a aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o @@ -410,17 +411,16 @@ dist: app ${MKDIR} dist ${MKDIR} dist/catalog ${MKDIR} dist/catalog/english - ${FLXCAT} catalog/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog - ${FLXCAT} catalog/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog - ${FLXCAT} catalog/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog + ${FLXCAT} text/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog + ${FLXCAT} text/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog + ${FLXCAT} text/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog ${MKDIR} dist/catalog/dansk - ${FLXCAT} catalog/help.cd catalog/dansk/amath-help.ct CATALOG dist/catalog/dansk/amath-help.catalog - ${FLXCAT} catalog/ident.cd catalog/dansk/amath-ident.ct CATALOG dist/catalog/dansk/amath-ident.catalog - ${FLXCAT} catalog/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog + ${FLXCAT} text/help.cd catalog/dansk/amath-help.ct CATALOG dist/catalog/dansk/amath-help.catalog + ${FLXCAT} text/ident.cd catalog/dansk/amath-ident.ct CATALOG dist/catalog/dansk/amath-ident.catalog + ${FLXCAT} text/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog ${COPY} amath dist/ ${COPY} LICENSE dist/ ${COPY} COPYRIGHT dist/ - ${COPY} catalog/README dist/catalog/ ${COPY} catalog/LICENSE dist/catalog/ clean: diff --git a/configure b/configure index 7544e083..c3ebc001 100755 --- a/configure +++ b/configure @@ -317,9 +317,10 @@ if $VALID ; then echo "libs: libamath libcomplex libcamath libamathapp" echo echo "catalogs: " - echo " \${FLXCAT} catalog/help.cd app/localize/help.h=catalog/help.sd" - echo " \${FLXCAT} catalog/ident-clean.cd app/localize/ident.h=catalog/ident.sd" - echo " \${FLXCAT} catalog/text.cd app/localize/text.h=catalog/text.sd" + echo " \${FLXCAT} text/keyword.cd app/localize/kword.h=text/keyword.sd" + echo " \${FLXCAT} text/help.cd app/localize/help.h=text/help.sd" + echo " \${FLXCAT} text/ident-clean.cd app/localize/ident.h=text/ident.sd" + echo " \${FLXCAT} text/text.cd app/localize/text.h=text/text.sd" echo echo "libamathapp: ${libapp}" echo " \${AR} rcs libamathapp${outext}.a ${libapp}" @@ -344,17 +345,16 @@ if $VALID ; then echo " \${MKDIR} dist" echo " \${MKDIR} dist/catalog" echo " \${MKDIR} dist/catalog/english" - echo " \${FLXCAT} catalog/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog" - echo " \${FLXCAT} catalog/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog" - echo " \${FLXCAT} catalog/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog" + echo " \${FLXCAT} text/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog" + echo " \${FLXCAT} text/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog" + echo " \${FLXCAT} text/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog" echo " \${MKDIR} dist/catalog/dansk" - echo " \${FLXCAT} catalog/help.cd catalog/dansk/amath-help.ct CATALOG dist/catalog/dansk/amath-help.catalog" - echo " \${FLXCAT} catalog/ident.cd catalog/dansk/amath-ident.ct CATALOG dist/catalog/dansk/amath-ident.catalog" - echo " \${FLXCAT} catalog/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog" + echo " \${FLXCAT} text/help.cd catalog/dansk/amath-help.ct CATALOG dist/catalog/dansk/amath-help.catalog" + echo " \${FLXCAT} text/ident.cd catalog/dansk/amath-ident.ct CATALOG dist/catalog/dansk/amath-ident.catalog" + echo " \${FLXCAT} text/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog" echo " \${COPY} amath dist/" echo " \${COPY} LICENSE dist/" echo " \${COPY} COPYRIGHT dist/" - echo " \${COPY} catalog/README dist/catalog/" echo " \${COPY} catalog/LICENSE dist/catalog/" echo echo "clean:"