Convert data/dtd subdir to non-recursive make

4 files changed, 28 insertions, 28 deletions

diff --git a/Makefile.am b/Makefile.am
index b89de832..d9440eca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,6 +141,33 @@ data/domains/yelp.xml: data/domains/yelp.xml.in
 	
 domain_DATA = data/domains/yelp.xml
 
+dtddir = $(pkgdatadir)/dtd
+
+dist_dtd_DATA = \
+	data/dtd/docbookx.dtd \
+	data/dtd/isoamsa.ent \
+	data/dtd/isoamsb.ent \
+	data/dtd/isoamsc.ent \
+	data/dtd/isoamsn.ent \
+	data/dtd/isoamso.ent \
+	data/dtd/isoamsr.ent \
+	data/dtd/isobox.ent \
+	data/dtd/isocyr1.ent \
+	data/dtd/isocyr2.ent \
+	data/dtd/isodia.ent \
+	data/dtd/isogrk1.ent \
+	data/dtd/isogrk2.ent \
+	data/dtd/isogrk3.ent \
+	data/dtd/isogrk4.ent \
+	data/dtd/isolat1.ent \
+	data/dtd/isolat2.ent \
+	data/dtd/isonum.ent \
+	data/dtd/isopub.ent \
+	data/dtd/isotech.ent
+
+dtd_DATA = \
+	data/dtd/catalog
+
 xsldir = $(pkgdatadir)/xslt
 
 xsl_DATA = \
diff --git a/configure.ac b/configure.ac
index 8a97db1e..aff34760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,6 @@ docs/libyelp/Makefile
 docs/libyelp/version.xml
 libyelp/Makefile
 data/Makefile
-data/dtd/Makefile
 data/dtd/catalog
 data/mathjax/Makefile
 data/mathjax/config/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index ff043d02..a057c9d7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = dtd mathjax
+SUBDIRS = mathjax
diff --git a/data/dtd/Makefile.am b/data/dtd/Makefile.am
deleted file mode 100644
index a6fa51aa..00000000
--- a/data/dtd/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-dtddir=$(datadir)/yelp/dtd
-
-dist_dtd_DATA = \
-	docbookx.dtd	\
-	isoamsa.ent	\
-	isoamsb.ent	\
-	isoamsc.ent	\
-	isoamsn.ent	\
-	isoamso.ent	\
-	isoamsr.ent	\
-	isobox.ent	\
-	isocyr1.ent	\
-	isocyr2.ent	\
-	isodia.ent	\
-	isogrk1.ent	\
-	isogrk2.ent	\
-	isogrk3.ent	\
-	isogrk4.ent	\
-	isolat1.ent	\
-	isolat2.ent	\
-	isonum.ent	\
-	isopub.ent	\
-	isotech.ent
-
-dtd_DATA =		\
-	catalog