diff --git a/cde/programs/dtdocbook/Makefile.am b/cde/programs/dtdocbook/Makefile.am index 357ec71ff..8b4224b7f 100644 --- a/cde/programs/dtdocbook/Makefile.am +++ b/cde/programs/dtdocbook/Makefile.am @@ -1,3 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = lib instant xlate_locale doc2sdl +SUBDIRS = lib instant xlate_locale doc2sdl sgml diff --git a/cde/programs/dtdocbook/doc2sdl/Makefile.am b/cde/programs/dtdocbook/doc2sdl/Makefile.am index 8d662750b..be63def09 100644 --- a/cde/programs/dtdocbook/doc2sdl/Makefile.am +++ b/cde/programs/dtdocbook/doc2sdl/Makefile.am @@ -1,3 +1 @@ MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = SGML diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/Makefile.am b/cde/programs/dtdocbook/doc2sdl/sgml/Makefile.am deleted file mode 100644 index 080f1c927..000000000 --- a/cde/programs/dtdocbook/doc2sdl/sgml/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -BUILT_SOURCES = docbook.dtd dtinfo.af -CLEANFILES = $(BUILT_SOURCES) - -docbook.dtd: $(top_srcdir)/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/docbook.dtd - $(LN_S) $< $@ - -dtinfo.af: $(top_srcdir)/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/dtinfo.af - $(LN_S) $< $@ - diff --git a/cde/programs/dtdocbook/sgml/Makefile.am b/cde/programs/dtdocbook/sgml/Makefile.am new file mode 100644 index 000000000..3236a54a8 --- /dev/null +++ b/cde/programs/dtdocbook/sgml/Makefile.am @@ -0,0 +1,36 @@ +MAINTAINERCLEANFILES = Makefile.in + +sgmldir = $(pkgdatadir)/dtdocbook/sgml + +sgml_DATA = docbook.dcl \ + docbook.dtd \ + dtinfoBook.dtd \ + dtinfoStyle.dtd \ + dtinfoTOC.dtd \ + dtinfo.af \ + catalog \ + hal.gml \ + iso-catalog \ + iso-amsa.gml \ + iso-amsb.gml \ + iso-amsc.gml \ + iso-amsn.gml \ + iso-amso.gml \ + iso-amsr.gml \ + iso-box.gml \ + iso-cyr1.gml \ + iso-cyr2.gml \ + iso-dia.gml \ + iso-grk1.gml \ + iso-grk2.gml \ + iso-grk3.gml \ + iso-grk4.gml \ + iso-lat1.gml \ + iso-lat2.gml \ + iso-mfrk.gml \ + iso-mopf.gml \ + iso-mscr.gml \ + iso-num.gml \ + iso-pub.gml \ + iso-tech.gml \ + styprolog.sgml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/catalog b/cde/programs/dtdocbook/sgml/catalog similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/catalog rename to cde/programs/dtdocbook/sgml/catalog diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/docbook.dcl b/cde/programs/dtdocbook/sgml/docbook.dcl similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/docbook.dcl rename to cde/programs/dtdocbook/sgml/docbook.dcl diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/docbook.dtd b/cde/programs/dtdocbook/sgml/docbook.dtd similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/docbook.dtd rename to cde/programs/dtdocbook/sgml/docbook.dtd diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/dtinfo.af b/cde/programs/dtdocbook/sgml/dtinfo.af similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/dtinfo.af rename to cde/programs/dtdocbook/sgml/dtinfo.af diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/dtinfoBook.dtd b/cde/programs/dtdocbook/sgml/dtinfoBook.dtd similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/dtinfoBook.dtd rename to cde/programs/dtdocbook/sgml/dtinfoBook.dtd diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/dtinfoStyle.dtd b/cde/programs/dtdocbook/sgml/dtinfoStyle.dtd similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/dtinfoStyle.dtd rename to cde/programs/dtdocbook/sgml/dtinfoStyle.dtd diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/dtinfoTOC.dtd b/cde/programs/dtdocbook/sgml/dtinfoTOC.dtd similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/dtinfoTOC.dtd rename to cde/programs/dtdocbook/sgml/dtinfoTOC.dtd diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/examples/docbook.sty b/cde/programs/dtdocbook/sgml/examples/docbook.sty similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/examples/docbook.sty rename to cde/programs/dtdocbook/sgml/examples/docbook.sty diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/hal.gml b/cde/programs/dtdocbook/sgml/hal.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/hal.gml rename to cde/programs/dtdocbook/sgml/hal.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-amsa.gml b/cde/programs/dtdocbook/sgml/iso-amsa.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-amsa.gml rename to cde/programs/dtdocbook/sgml/iso-amsa.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-amsb.gml b/cde/programs/dtdocbook/sgml/iso-amsb.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-amsb.gml rename to cde/programs/dtdocbook/sgml/iso-amsb.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-amsc.gml b/cde/programs/dtdocbook/sgml/iso-amsc.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-amsc.gml rename to cde/programs/dtdocbook/sgml/iso-amsc.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-amsn.gml b/cde/programs/dtdocbook/sgml/iso-amsn.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-amsn.gml rename to cde/programs/dtdocbook/sgml/iso-amsn.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-amso.gml b/cde/programs/dtdocbook/sgml/iso-amso.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-amso.gml rename to cde/programs/dtdocbook/sgml/iso-amso.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-amsr.gml b/cde/programs/dtdocbook/sgml/iso-amsr.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-amsr.gml rename to cde/programs/dtdocbook/sgml/iso-amsr.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-box.gml b/cde/programs/dtdocbook/sgml/iso-box.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-box.gml rename to cde/programs/dtdocbook/sgml/iso-box.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-catalog b/cde/programs/dtdocbook/sgml/iso-catalog similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-catalog rename to cde/programs/dtdocbook/sgml/iso-catalog diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-cyr1.gml b/cde/programs/dtdocbook/sgml/iso-cyr1.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-cyr1.gml rename to cde/programs/dtdocbook/sgml/iso-cyr1.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-cyr2.gml b/cde/programs/dtdocbook/sgml/iso-cyr2.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-cyr2.gml rename to cde/programs/dtdocbook/sgml/iso-cyr2.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-dia.gml b/cde/programs/dtdocbook/sgml/iso-dia.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-dia.gml rename to cde/programs/dtdocbook/sgml/iso-dia.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-grk1.gml b/cde/programs/dtdocbook/sgml/iso-grk1.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-grk1.gml rename to cde/programs/dtdocbook/sgml/iso-grk1.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-grk2.gml b/cde/programs/dtdocbook/sgml/iso-grk2.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-grk2.gml rename to cde/programs/dtdocbook/sgml/iso-grk2.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-grk3.gml b/cde/programs/dtdocbook/sgml/iso-grk3.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-grk3.gml rename to cde/programs/dtdocbook/sgml/iso-grk3.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-grk4.gml b/cde/programs/dtdocbook/sgml/iso-grk4.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-grk4.gml rename to cde/programs/dtdocbook/sgml/iso-grk4.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-lat1.gml b/cde/programs/dtdocbook/sgml/iso-lat1.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-lat1.gml rename to cde/programs/dtdocbook/sgml/iso-lat1.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-lat2.gml b/cde/programs/dtdocbook/sgml/iso-lat2.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-lat2.gml rename to cde/programs/dtdocbook/sgml/iso-lat2.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-mfrk.gml b/cde/programs/dtdocbook/sgml/iso-mfrk.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-mfrk.gml rename to cde/programs/dtdocbook/sgml/iso-mfrk.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-mopf.gml b/cde/programs/dtdocbook/sgml/iso-mopf.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-mopf.gml rename to cde/programs/dtdocbook/sgml/iso-mopf.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-mscr.gml b/cde/programs/dtdocbook/sgml/iso-mscr.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-mscr.gml rename to cde/programs/dtdocbook/sgml/iso-mscr.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-num.gml b/cde/programs/dtdocbook/sgml/iso-num.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-num.gml rename to cde/programs/dtdocbook/sgml/iso-num.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-pub.gml b/cde/programs/dtdocbook/sgml/iso-pub.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-pub.gml rename to cde/programs/dtdocbook/sgml/iso-pub.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/iso-tech.gml b/cde/programs/dtdocbook/sgml/iso-tech.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/iso-tech.gml rename to cde/programs/dtdocbook/sgml/iso-tech.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/proxy.ss b/cde/programs/dtdocbook/sgml/proxy.ss similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/proxy.ss rename to cde/programs/dtdocbook/sgml/proxy.ss diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/styprolog.sgml b/cde/programs/dtdocbook/sgml/styprolog.sgml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/styprolog.sgml rename to cde/programs/dtdocbook/sgml/styprolog.sgml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/tei-arb.gml b/cde/programs/dtdocbook/sgml/tei-arb.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/tei-arb.gml rename to cde/programs/dtdocbook/sgml/tei-arb.gml diff --git a/cde/programs/dtdocbook/doc2sdl/sgml/tei-ipa.gml b/cde/programs/dtdocbook/sgml/tei-ipa.gml similarity index 100% rename from cde/programs/dtdocbook/doc2sdl/sgml/tei-ipa.gml rename to cde/programs/dtdocbook/sgml/tei-ipa.gml