From ee0719f2394c5f1387985b014ca8dc9bd0aa1780 Mon Sep 17 00:00:00 2001
From: BlackLight <blacklight@autistici.org>
Date: Fri, 8 Oct 2010 18:18:30 +0200
Subject: [PATCH] Changed Makefile for managing the web server pages
---
Makefile.am | 11 +++++++++++
Makefile.in | 36 +++++++++++++++++++++++++-----------
htdocs/graph.json | 11 -----------
3 files changed, 36 insertions(+), 22 deletions(-)
delete mode 100644 htdocs/graph.json
diff --git a/Makefile.am b/Makefile.am
index 9c77ccb..440822e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,3 +50,14 @@ doc-install:
cp -r doc/* "${DOC_PREFIX}"; \
fi
+install-data-hook:
+ mkdir -p "${SHARE_PREFIX}/htdocs"
+ mkdir -p "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/index.html" "${SHARE_PREFIX}/htdocs"
+ install -m 0755 "${PWD}/htdocs/test.cgi" "${SHARE_PREFIX}/htdocs"
+ install -m 0644 "${PWD}/htdocs/js/Curry-1.0.1.js" "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/js/dracula_algorithms.js" "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/js/dracula_graffle.js" "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/js/dracula_graph.js" "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/js/raphael-min.js" "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/js/seedrandom.js" "${SHARE_PREFIX}/htdocs/js"
diff --git a/Makefile.in b/Makefile.in
index e1de979..7ff32f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -732,7 +732,8 @@ info: info-am
info-am:
install-data-am: install-corr_rulesDATA install-shareDATA
-
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-dvi: install-dvi-am
install-dvi-am:
@@ -781,7 +782,7 @@ ps-am:
uninstall-am: uninstall-corr_rulesDATA uninstall-libLTLIBRARIES \
uninstall-shareDATA
-.MAKE: all check install install-am install-strip
+.MAKE: all check install install-am install-data-am install-strip
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
@@ -791,15 +792,16 @@ uninstall-am: uninstall-corr_rulesDATA uninstall-libLTLIBRARIES \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-corr_rulesDATA install-data install-data-am \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-shareDATA install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-corr_rulesDATA \
- uninstall-libLTLIBRARIES uninstall-shareDATA
+ install-data-hook install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-libLTLIBRARIES install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-shareDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-corr_rulesDATA uninstall-libLTLIBRARIES \
+ uninstall-shareDATA
doc:
@@ -813,6 +815,18 @@ doc-install:
cp -r doc/* "${DOC_PREFIX}"; \
fi
+install-data-hook:
+ mkdir -p "${SHARE_PREFIX}/htdocs"
+ mkdir -p "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/index.html" "${SHARE_PREFIX}/htdocs"
+ install -m 0755 "${PWD}/htdocs/test.cgi" "${SHARE_PREFIX}/htdocs"
+ install -m 0644 "${PWD}/htdocs/js/Curry-1.0.1.js" "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/js/dracula_algorithms.js" "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/js/dracula_graffle.js" "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/js/dracula_graph.js" "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/js/raphael-min.js" "${SHARE_PREFIX}/htdocs/js"
+ install -m 0644 "${PWD}/htdocs/js/seedrandom.js" "${SHARE_PREFIX}/htdocs/js"
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/htdocs/graph.json b/htdocs/graph.json
deleted file mode 100644
index e2a8cc9..0000000
--- a/htdocs/graph.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[{
- "id": 1,
- "label": "test1",
- "connectedTo": [
- { "id": 2 }
- ]
-}, {
- "id": 2,
- "label": "test2"
-}]
-