Index: branches/eam_branches/ipp-20120905/dvodist/INSTALL
===================================================================
--- branches/eam_branches/ipp-20120905/dvodist/INSTALL	(revision 34547)
+++ branches/eam_branches/ipp-20120905/dvodist/INSTALL	(revision 34548)
@@ -2,10 +2,5 @@
 after setting up psconfig:
 
-kiawe / alala example:
- psconfigure --dbhost alala --dbuser ipp --dbpass ipp --htdocs /var/www/kiawe
-
-# Regular installation on ippMonitor.ifa.hawaii.edu
-# Note: we use a 'science databases (replication) slave' and the ippMonitor read-only account to connect to that database
-psconfigure --dbhost scidbs1 --dbuser ippMonitor --dbpass ippMonitor --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
-psconfigure --htdocs /data/ippc17.0/www/dvodist/
-make php
+ippc17 / dvodist example
+ psconfigure --htdocs /data/ippc17.0/www/dvodist
+ make php
Index: branches/eam_branches/ipp-20120905/dvodist/Makefile.in
===================================================================
--- branches/eam_branches/ipp-20120905/dvodist/Makefile.in	(revision 34547)
+++ branches/eam_branches/ipp-20120905/dvodist/Makefile.in	(revision 34548)
@@ -4,4 +4,6 @@
 
 # copy 'scripts' to target, copy 'www-util' to target, copy '
+
+GENERATE = src/generate
 
 SRC-ROOT = www-root
@@ -35,45 +37,41 @@
 $(TGT-ROOT)/ipp.css
 
+TEST = \
+$(TGT-ROOT)/help.php \
+$(TGT-UTIL)/ipp.page.php
+
+test: $(TEST)
+
 php: $(ROOT) $(UTIL) $(PROG)
 
-# dependancy rules for binary code #########################
-# .PRECIOUS: %.$(ARCH).o
-# .PRECIOUS: $(BIN)/%.$(ARCH)
+## # non-generated php code is copied directly
+## $(TGT-ROOT)/%: $(SRC-ROOT)/%
+## 	@if [ ! -d $(TGT-ROOT) ]; then mkdir -p $(TGT-ROOT) || exit; fi
+## 	cp $(SRC-ROOT)/$* $(TGT-ROOT)/$* || exit
+## 	chmod +x $(TGT-ROOT)/$* || exit
+## 
+## $(TGT-PROG)/%: $(SRC-PROG)/%
+## 	@if [ ! -d $(TGT-PROG) ]; then mkdir -p $(TGT-PROG) || exit; fi
+## 	cp $(SRC-PROG)/$* $(TGT-PROG)/$* || exit
+## 	chmod +x $(TGT-PROG)/$* || exit
+## 
+## $(TGT-UTIL)/%: $(SRC-UTIL)/%
+## 	@if [ ! -d $(TGT-UTIL) ]; then mkdir -p $(TGT-UTIL) || exit; fi
+## 	cp $(SRC-UTIL)/$* $(TGT-UTIL)/$* || exit
+## 	chmod +x $(TGT-UTIL)/$* || exit
 
-# $(DESTLINK): $(DESTWWW)/Login.php
-# 	rm -f $@
-# 	ln -s $(DESTWWW)/Login.php $@
-# 
-# $(DESTWWW)/version.php:
-# 	svnversion > $@
+# mkd files are used to generate php files
+$(TGT-ROOT)/%.php: $(SRC-ROOT)/%.mkd
+	@if [ ! -d $(TGT-ROOT) ]; then mkdir -p $(TGT-ROOT) || exit; fi
+	rm -f $(TGT-ROOT)/$*.php || exit
+	$(GENERATE) --htdocs @HTDOCS@ $(SRC-ROOT)/$*.mkd $(TGT-ROOT)/$*.php || exit
 
-# non-generated php code is copied directly
-$(TGT-ROOT)/%: $(SRC-ROOT)/%
-	@if [ ! -d $(TGT-ROOT) ]; then mkdir -p $(TGT-ROOT) || exit; fi
-	cp $(SRC-ROOT)/$* $(TGT-ROOT)/$* || exit
-	chmod +x $(TGT-ROOT)/$* || exit
-
-$(TGT-PROG)/%: $(SRC-PROG)/%
-	@if [ ! -d $(TGT-PROG) ]; then mkdir -p $(TGT-PROG) || exit; fi
-	cp $(SRC-PROG)/$* $(TGT-PROG)/$* || exit
-	chmod +x $(TGT-PROG)/$* || exit
-
-$(TGT-UTIL)/%: $(SRC-UTIL)/%
+# mkd files are used to generate php files
+$(TGT-UTIL)/%.php: $(SRC-UTIL)/%.mkd
 	@if [ ! -d $(TGT-UTIL) ]; then mkdir -p $(TGT-UTIL) || exit; fi
-	cp $(SRC-UTIL)/$* $(TGT-UTIL)/$* || exit
-	chmod +x $(TGT-UTIL)/$* || exit
-
-# $(TGT-ROOT)/%.css: $(TGT-SRC)/%.css
-# 	@if [ ! -d $(TGT-ROOT) ]; then mkdir -p $(TGT-ROOT) || exit; fi
-# 	rm -f $(TGT-ROOT)/$*.css || exit
-# 	cp $(TGT-SRC)/$*.css $(TGT-ROOT)/$*.css || exit
-# 
-# $(TGT-ROOT)/%.php: $(TGT-SRC)/%.php
-# 	@if [ ! -d $(TGT-ROOT) ]; then mkdir -p $(TGT-ROOT) || exit; fi
-# 	rm -f $(TGT-ROOT)/$*.php || exit
-# 	cp $(TGT-SRC)/$*.php $(TGT-ROOT)/$*.php || exit
+	rm -f $(TGT-UTIL)/$*.php || exit
+	$(GENERATE) --htdocs @HTDOCS@ $(SRC-UTIL)/$*.mkd $(TGT-UTIL)/$*.php || exit
 
 # utilities #################################################
-
 clean:	
 	rm -f `find . -name "*.o"`
@@ -81,4 +79,5 @@
 	rm -f `find . -name "#*"`
 
+.PRECIOUS: $(SRC)/%.mkd
 .PRECIOUS: $(SRC)/%.php
 .PRECIOUS: $(SRC)/%.css