Improve header generation, slightly

* Makefiles have a common install prefix now, and run everything from
  that prefix
* The prefix is passed as an argument to each of the header scripts
  for easier relocation
* Main Makefile automatically reinstalls scripts when they change
* Added `clean' target

diff --git a/Makefile b/Makefile
dissimilarity index 67%
index 3231768..df903ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,21 @@
-all: header.mlt footer.mlt
-
-header.mlt: /etc/hcoop.header header.setTitle header.mlt.in
-       cat header.setTitle >header.mlt
-       hcoop_header "<% Web.html title %>" >>header.mlt
-       cat header.mlt.in >>header.mlt
-
-footer.mlt: /etc/hcoop.footer footer.mlt.in
-       cat footer.mlt.in >footer.mlt
-       hcoop_footer >>footer.mlt
+include Makefile.common
+
+all: install-scripts header.mlt footer.mlt
+
+clean:
+       rm header.mlt
+       rm footer.mlt
+
+header.mlt: $(prefix)/etc/hcoop.header header.setTitle header.mlt.in
+       cat header.setTitle >header.mlt
+       $(prefix)/bin/hcoop_header $(prefix) "<% Web.html title %>" >>header.mlt
+       cat header.mlt.in >>header.mlt
+
+footer.mlt: $(prefix)/etc/hcoop.footer footer.mlt.in
+       cat footer.mlt.in >footer.mlt
+       $(prefix)/bin/hcoop_footer $(prefix) >>footer.mlt
+
+install-scripts: scripts/*
+       install -m 750 -o hcoop scripts/hcoop_header $(prefix)/bin
+       install -m 750 -o hcoop scripts/hcoop_footer $(prefix)/bin
+       install -m 750 -o hcoop scripts/hcoop_html $(prefix)/bin

diff --git a/Makefile.common b/Makefile.common
new file mode 100644 (file)
index 0000000..47f4014
--- /dev/null
+++ b/Makefile.common
@@ -0,0 +1,3 @@
+# -*- make -*-
+
+prefix = /afs/hcoop.net/user/h/hc/hcoop/portal-tools

diff --git a/app/Makefile b/app/Makefile
index a4b2a23..b1cf003 100644 (file)
--- a/app/Makefile
+++ b/app/Makefile
@@ -1,8 +1,14 @@
+include ../Makefile.common
+
 all: header.mlt footer.mlt
 
-header.mlt: /etc/hcoop.header header.setTitle
+clean:
+       rm header.mlt
+       rm footer.mlt
+
+header.mlt: $(prefix)/etc/hcoop.header header.setTitle
        cat header.setTitle >header.mlt
-       hcoop_header "<% Web.html title %>" >>header.mlt
+       $(prefix)/bin/hcoop_header $(prefix) "<% Web.html title %>" >>header.mlt
 
-footer.mlt: /etc/hcoop.footer
-       hcoop_footer >>footer.mlt
+footer.mlt: $(prefix)/etc/hcoop.footer
+       $(prefix)/bin/hcoop_footer $(prefix) >footer.mlt

diff --git a/passgen/Makefile b/passgen/Makefile
index 59ce744..df49375 100644 (file)
--- a/passgen/Makefile
+++ b/passgen/Makefile
@@ -1,4 +1,9 @@
+include ../Makefile.common
+
 all: passgen.mlt
 
-passgen.mlt: /etc/hcoop.header /etc/hcoop.footer passgen.mlt.in
-       hcoop_html "HCoop Passgen" passgen.mlt.in >passgen.mlt
+clean:
+       rm passgen.mlt
+
+passgen.mlt: $(prefix)/etc/hcoop.header $(prefix)/etc/hcoop.footer passgen.mlt.in
+       $(prefix)/bin/hcoop_html $(prefix) "HCoop Passgen" passgen.mlt.in >passgen.mlt

diff --git a/scripts/hcoop_footer b/scripts/hcoop_footer
index 3bbd378..876a002 100755 (executable)
--- a/scripts/hcoop_footer
+++ b/scripts/hcoop_footer
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-cat /etc/hcoop.footer
+cat "$1"/etc/hcoop.footer

diff --git a/scripts/hcoop_header b/scripts/hcoop_header
index a88619a..41b35c4 100755 (executable)
--- a/scripts/hcoop_header
+++ b/scripts/hcoop_header
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-cat /etc/hcoop.header | sed "s/TITLE/$1/g"
+cat "$1"/etc/hcoop.header | sed "s/TITLE/$2/g"

diff --git a/scripts/hcoop_html b/scripts/hcoop_html
index e190643..7f98f84 100755 (executable)
--- a/scripts/hcoop_html
+++ b/scripts/hcoop_html
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-hcoop_header "$1"
-cat $2
-hcoop_footer
+"$1"/bin/hcoop_header "$1" "$2"
+cat "$3"
+"$1"/bin/hcoop_footer "$1"