summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMukund Sivaraman <muks@banu.com>2009-09-13 04:08:06 +0530
committerMukund Sivaraman <muks@banu.com>2009-09-13 04:08:06 +0530
commit7b4f67ecef6204b73e46cb4dc3b7fec0e196d3da (patch)
treeb57f063ef377a7e997f27d6042f0c0f1e8c0858c
parent9d7bd43d8e395c9bc575c74ecf899cf6e6230407 (diff)
data: Cleanup installation of templates
-rw-r--r--Makefile.am12
-rw-r--r--data/templates/Makefile.am5
2 files changed, 5 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index a10dc3b..301d2af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,15 +8,3 @@ CONFIG_FILES = \
EXTRA_DIST = $(CONFIG_FILES) TODO autogen.sh
SUBDIRS = src data etc doc packaging
-install-data-local: tinyproxy-html-files
-
-# Install the HTML files
-tinyproxy-html-files:
- $(mkinstalldirs) $(DESTDIR)$(datadir)/tinyproxy
-
- for file in debug default stats; do \
- $(INSTALL) -m 644 $(srcdir)/data/templates/$$file.html $(DESTDIR)$(datadir)/tinyproxy/$$file.html.dist ; \
- test -f $(DESTDIR)$(datadir)/tinyproxy/$$file.html || \
- $(INSTALL) -m 644 $(srcdir)/data/templates/$$file.html $(DESTDIR)$(datadir)/tinyproxy/$$file.html ; \
- done
-
diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am
index 5c2f1be..e4b0134 100644
--- a/data/templates/Makefile.am
+++ b/data/templates/Makefile.am
@@ -1,7 +1,12 @@
+templatesdir = $(pkgdatadir)
+
TEMPLATES = \
debug.html \
default.html \
stats.html
+templates_DATA = \
+ $(TEMPLATES)
+
EXTRA_DIST = \
$(TEMPLATES)