properly install data in docdir

27 files changed, 57 insertions, 20 deletions

diff --git a/Makefile.am b/Makefile.am
index 5834e07..c8975ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,28 @@
+## C program
 SUBDIRS = src
-dist_doc_DATA = README.txt
 
+# data files
+dist_doc_DATA = README.txt copyright
+EXTRA_DIST = examples licenses
+
+install_doc: $(srcdir)/examples $(srcdir)/licenses
+	cd $(srcdir) && for D in `find examples licenses -type d`; do \
+		$(MKDIR_P) $(DESTDIR)/$(docdir)/"$$D"; \
+	done
+	cd $(srcdir) && for F in `find examples licenses -type f`; do \
+		$(INSTALL_DATA) "$$F" $(DESTDIR)/$(docdir)/"$$F"; \
+	done
+
+uninstall_doc:
+	rm -rf $(DESTDIR)/$(docdir)/examples $(DESTDIR)/$(docdir)/licenses
+	-rmdir $(DESTDIR)/$(docdir)
+
+install-data-local: install_doc
+uninstall-local: uninstall_doc
+
+.PHONY: install-doc uninstall-doc
+
+## init scripts
 transform_name = @program_transform_name@
 hydrilla_new_name = `echo hydrilla | sed '$(transform_name)'`
 subst_perform = sed -e 's|[@]hydrilla[@]|'$(hydrilla_new_name)'|g' \
@@ -8,10 +30,8 @@ subst_perform = sed -e 's|[@]hydrilla[@]|'$(hydrilla_new_name)'|g' \
 		-e 's|[@]runstatedir[@]|$(runstatedir)|g' \
 		-e 's|[@]logdir[@]|$(localstatedir)/log|g'
 
-
 bin_SCRIPTS =
 CLEANFILES =
-EXTRA_DIST =
 
 # SysV init script
 CLEANFILES += daemon/sysv
@@ -28,9 +48,8 @@ install-sysv-script: $(srcdir)/daemon/sysv
 	$(INSTALL_SCRIPT) $< $(sysv_script_dest_path)
 
 uninstall-sysv-script:
-	rm -f $(DESTDIR)/$(sysv_script_dest_path)
+	rm -f $(sysv_script_dest_path)
 
-# Inform Automake about our special (un)install rules
 install-exec-local: install-sysv-script
 uninstall-local: uninstall-sysv-script
 
diff --git a/Makefile.in b/Makefile.in
index cfadfe4..69404ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -317,7 +317,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = src
-dist_doc_DATA = README.txt
+
+# data files
+dist_doc_DATA = README.txt copyright
+EXTRA_DIST = examples licenses daemon/sysv.in
 transform_name = @program_transform_name@
 hydrilla_new_name = `echo hydrilla | sed '$(transform_name)'`
 subst_perform = sed -e 's|[@]hydrilla[@]|'$(hydrilla_new_name)'|g' \
@@ -329,7 +332,6 @@ bin_SCRIPTS =
 
 # SysV init script
 CLEANFILES = daemon/sysv
-EXTRA_DIST = daemon/sysv.in
 sysv_script_dest_loc = $(DESTDIR)/etc/init.d
 sysv_script_dest_path = $(sysv_script_dest_loc)/$(hydrilla_new_name)
 all: config.h
@@ -798,7 +800,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-dist_docDATA
+install-data-am: install-data-local install-dist_docDATA
 
 install-dvi: install-dvi-recursive
 
@@ -857,19 +859,36 @@ uninstall-am: uninstall-binSCRIPTS uninstall-dist_docDATA \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binSCRIPTS install-data install-data-am \
-	install-dist_docDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-local install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	tags-am uninstall uninstall-am uninstall-binSCRIPTS \
-	uninstall-dist_docDATA uninstall-local
+	install-data-local install-dist_docDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binSCRIPTS uninstall-dist_docDATA uninstall-local
 
 .PRECIOUS: Makefile
 
 
+install_doc: $(srcdir)/examples $(srcdir)/licenses
+	cd $(srcdir) && for D in `find examples licenses -type d`; do \
+		$(MKDIR_P) $(DESTDIR)/$(docdir)/"$$D"; \
+	done
+	cd $(srcdir) && for F in `find examples licenses -type f`; do \
+		$(INSTALL_DATA) "$$F" $(DESTDIR)/$(docdir)/"$$F"; \
+	done
+
+uninstall_doc:
+	rm -rf $(DESTDIR)/$(docdir)/examples $(DESTDIR)/$(docdir)/licenses
+	-rmdir $(DESTDIR)/$(docdir)
+
+install-data-local: install_doc
+uninstall-local: uninstall_doc
+
+.PHONY: install-doc uninstall-doc
+
 $(srcdir)/daemon/sysv: $(srcdir)/daemon/sysv.in $(srcdir)/Makefile
 	$(subst_perform) < $< > $@
 
@@ -878,9 +897,8 @@ install-sysv-script: $(srcdir)/daemon/sysv
 	$(INSTALL_SCRIPT) $< $(sysv_script_dest_path)
 
 uninstall-sysv-script:
-	rm -f $(DESTDIR)/$(sysv_script_dest_path)
+	rm -f $(sysv_script_dest_path)
 
-# Inform Automake about our special (un)install rules
 install-exec-local: install-sysv-script
 uninstall-local: uninstall-sysv-script
 
diff --git a/example/README.txt b/examples/README.txt
index bbc1bca..1f1f57f 100644
--- a/example/README.txt
+++ b/examples/README.txt
@@ -1,4 +1,4 @@
 This directory contains example resources for Hydrilla. They do not do anything
 useful - just print some kind of "hello" message on given websites. They are
 meant for use as a reference for data format and as a mock of real resources
-for use whene developing.
+for use when developing.
diff --git a/example/content/bhello_ap/index.json b/examples/content/bhello_ap/index.json
index 2552c31..2552c31 100644
--- a/example/content/bhello_ap/index.json
+++ b/examples/content/bhello_ap/index.json
diff --git a/example/content/bhello_ap_cu/index.json b/examples/content/bhello_ap_cu/index.json
index 5f093e7..5f093e7 100644
--- a/example/content/bhello_ap_cu/index.json
+++ b/examples/content/bhello_ap_cu/index.json
diff --git a/example/content/bhello_cu/index.json b/examples/content/bhello_cu/index.json
index 47023ca..47023ca 100644
--- a/example/content/bhello_cu/index.json
+++ b/examples/content/bhello_cu/index.json
diff --git a/example/content/bhello_pe/index.json b/examples/content/bhello_pe/index.json
index 07de71a..07de71a 100644
--- a/example/content/bhello_pe/index.json
+++ b/examples/content/bhello_pe/index.json
diff --git a/example/content/bhello_pe_pi/index.json b/examples/content/bhello_pe_pi/index.json
index 5ceff86..5ceff86 100644
--- a/example/content/bhello_pe_pi/index.json
+++ b/examples/content/bhello_pe_pi/index.json
diff --git a/example/content/bhello_pi/index.json b/examples/content/bhello_pi/index.json
index 8e6946e..8e6946e 100644
--- a/example/content/bhello_pi/index.json
+++ b/examples/content/bhello_pi/index.json
diff --git a/example/content/phachettebugs1/index.json b/examples/content/phachettebugs1/index.json
index fac24ef..fac24ef 100644
--- a/example/content/phachettebugs1/index.json
+++ b/examples/content/phachettebugs1/index.json
diff --git a/example/content/phachettebugs2/index.json b/examples/content/phachettebugs2/index.json
index 891f0d2..891f0d2 100644
--- a/example/content/phachettebugs2/index.json
+++ b/examples/content/phachettebugs2/index.json
diff --git a/example/content/phachettebugs3/index.json b/examples/content/phachettebugs3/index.json
index 7187af5..7187af5 100644
--- a/example/content/phachettebugs3/index.json
+++ b/examples/content/phachettebugs3/index.json
diff --git a/example/content/phachettebugs4/index.json b/examples/content/phachettebugs4/index.json
index 203153a..203153a 100644
--- a/example/content/phachettebugs4/index.json
+++ b/examples/content/phachettebugs4/index.json
diff --git a/example/content/pkoszko.org_hello1/index.json b/examples/content/pkoszko.org_hello1/index.json
index 013ce7c..013ce7c 100644
--- a/example/content/pkoszko.org_hello1/index.json
+++ b/examples/content/pkoszko.org_hello1/index.json
diff --git a/example/content/pkoszko.org_hello2/index.json b/examples/content/pkoszko.org_hello2/index.json
index a61f7e6..a61f7e6 100644
--- a/example/content/pkoszko.org_hello2/index.json
+++ b/examples/content/pkoszko.org_hello2/index.json
diff --git a/example/content/pkoszko.org_hello3/index.json b/examples/content/pkoszko.org_hello3/index.json
index d0e00d0..d0e00d0 100644
--- a/example/content/pkoszko.org_hello3/index.json
+++ b/examples/content/pkoszko.org_hello3/index.json
diff --git a/example/content/pmyfsfhello1/index.json b/examples/content/pmyfsfhello1/index.json
index d151f1b..d151f1b 100644
--- a/example/content/pmyfsfhello1/index.json
+++ b/examples/content/pmyfsfhello1/index.json
diff --git a/example/content/pmyfsfhello2/index.json b/examples/content/pmyfsfhello2/index.json
index 2bd0be3..2bd0be3 100644
--- a/example/content/pmyfsfhello2/index.json
+++ b/examples/content/pmyfsfhello2/index.json
diff --git a/example/content/pmyfsfhello3/index.json b/examples/content/pmyfsfhello3/index.json
index ba0a126..ba0a126 100644
--- a/example/content/pmyfsfhello3/index.json
+++ b/examples/content/pmyfsfhello3/index.json
diff --git a/example/content/shello_apple/hello.js b/examples/content/shello_apple/hello.js
index b6b1a02..b6b1a02 100644
--- a/example/content/shello_apple/hello.js
+++ b/examples/content/shello_apple/hello.js
diff --git a/example/content/shello_apple/index.json b/examples/content/shello_apple/index.json
index c52c32c..c52c32c 100644
--- a/example/content/shello_apple/index.json
+++ b/examples/content/shello_apple/index.json
diff --git a/example/content/shello_cucumber/hello.js b/examples/content/shello_cucumber/hello.js
index b285094..b285094 100644
--- a/example/content/shello_cucumber/hello.js
+++ b/examples/content/shello_cucumber/hello.js
diff --git a/example/content/shello_cucumber/index.json b/examples/content/shello_cucumber/index.json
index 788d51e..788d51e 100644
--- a/example/content/shello_cucumber/index.json
+++ b/examples/content/shello_cucumber/index.json
diff --git a/example/content/shello_pear/hello.js b/examples/content/shello_pear/hello.js
index 0e98fdd..0e98fdd 100644
--- a/example/content/shello_pear/hello.js
+++ b/examples/content/shello_pear/hello.js
diff --git a/example/content/shello_pear/index.json b/examples/content/shello_pear/index.json
index 65d8d61..65d8d61 100644
--- a/example/content/shello_pear/index.json
+++ b/examples/content/shello_pear/index.json
diff --git a/example/content/shello_pineapple/hello.js b/examples/content/shello_pineapple/hello.js
index 3632e67..3632e67 100644
--- a/example/content/shello_pineapple/hello.js
+++ b/examples/content/shello_pineapple/hello.js
diff --git a/example/content/shello_pineapple/index.json b/examples/content/shello_pineapple/index.json
index f75935a..f75935a 100644
--- a/example/content/shello_pineapple/index.json
+++ b/examples/content/shello_pineapple/index.json