summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid King <amigadave@amigadave.com>2015-10-20 12:35:32 +0200
committerDavid King <amigadave@amigadave.com>2015-10-20 12:35:32 +0200
commit161c9c4de6e9a410f84fcdcaf6e497253cef7575 (patch)
treea182bf14619fc74527616cd477ba34be7c7820cc
parent9c26b435d7861870766b787a0dee0cd66ad7e4d2 (diff)
downloadyelp-161c9c4de6e9a410f84fcdcaf6e497253cef7575.tar.gz
Convert data/xslt subdir to non-recursive make
-rw-r--r--Makefile.am9
-rw-r--r--configure.ac1
-rw-r--r--data/Makefile.am2
-rw-r--r--data/xslt/Makefile.am8
4 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 22c08ed4..b29acb4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,6 +126,15 @@ dist_scalableicon_DATA = \
data/icons/hicolor/scalable/status/yelp-page-video-symbolic.svg \
data/icons/hicolor/scalable/status/yelp-page-symbolic.svg
+xsldir = $(pkgdatadir)/xslt
+
+xsl_DATA = \
+ data/xslt/db2html.xsl \
+ data/xslt/info2html.xsl \
+ data/xslt/mal2html.xsl \
+ data/xslt/man2html.xsl \
+ data/xslt/yelp-common.xsl
+
dist_noinst_DATA = \
$(desktop_in_files) \
$(gsettings_SCHEMAS) \
diff --git a/configure.ac b/configure.ac
index 1415bd51..56cda570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,7 +202,6 @@ data/mathjax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Makefile
data/mathjax/jax/output/Makefile
data/mathjax/jax/output/NativeMML/Makefile
data/mathjax/unpacked/Makefile
-data/xslt/Makefile
data/xslt/db2html.xsl
data/xslt/info2html.xsl
data/xslt/mal2html.xsl
diff --git a/data/Makefile.am b/data/Makefile.am
index 1ad5efbf..ed2953ee 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = domains dtd mathjax xslt
+SUBDIRS = domains dtd mathjax
diff --git a/data/xslt/Makefile.am b/data/xslt/Makefile.am
deleted file mode 100644
index a49c73c5..00000000
--- a/data/xslt/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-xsldir=$(datadir)/yelp/xslt
-
-xsl_DATA = \
- db2html.xsl \
- info2html.xsl \
- mal2html.xsl \
- man2html.xsl \
- yelp-common.xsl