Index: branches/eam_branches/ipp-20120905/dvodist/Makefile.in
===================================================================
--- branches/eam_branches/ipp-20120905/dvodist/Makefile.in	(revision 34557)
+++ branches/eam_branches/ipp-20120905/dvodist/Makefile.in	(revision 34561)
@@ -1,47 +1,60 @@
-default: php
+default: help
 help:
-	@echo "USAGE: make php"
+	@echo "USAGE: make (website)"
+	@echo "  (website) = dvodist or ippdata"
 
 GENERATE = src/generate
 
-SRC-ROOT = www-root
+# we have 2 sites (or more?) controlled by this build directory
+# make dvodist : internal web site
+# make ippdata : external web site
+
+# these are common code not available via the web server
 SRC-UTIL = www-util
-SRC-PROG = scripts
+TGT-UTIL = @HTDOCS@/www-util
 
-TGT-ROOT = @HTDOCS@/www-root
-TGT-UTIL = @HTDOCS@/www-util
-TGT-PROG = @HTDOCS@/scripts
+# these are the available web files
+SRC-DVODIST = dvodist
+SRC-IPPDATA = ippdata
+TGT-DVODIST = @HTDOCS@/dvodist
+TGT-IPPDATA = @HTDOCS@/ippdata
 
-PROG = \
-$(TGT-PROG)/mkdist.20120509.sh \
-$(TGT-PROG)/mkdist.20120525.sh \
-$(TGT-PROG)/mkdist.20120606.sh \
-$(TGT-PROG)/mkdist.testcat.sh \
-$(TGT-PROG)/mkindex.sh
-
+# common code used by all installation?
 UTIL = \
 $(TGT-UTIL)/blank.html \
+$(TGT-UTIL)/ipp.page.php \
 $(TGT-UTIL)/ipp.menu.dat \
-$(TGT-UTIL)/ipp.page.php \
 $(TGT-UTIL)/ipp.php \
 $(TGT-UTIL)/markdown.php \
 $(TGT-UTIL)/phptest.php
 
-ROOT = \
-$(TGT-ROOT)/PScolorlogo2.jpg \
-$(TGT-ROOT)/index.php \
-$(TGT-ROOT)/test.php \
-$(TGT-ROOT)/docs.php \
-$(TGT-ROOT)/help.php \
-$(TGT-ROOT)/ipp.css
+DVODIST = \
+$(TGT-UTIL)/dvodist.menu.dat \
+$(TGT-UTIL)/dvodist.page.php \
+$(TGT-DVODIST)/PScolorlogo2.jpg \
+$(TGT-DVODIST)/index.php \
+$(TGT-DVODIST)/test.php \
+$(TGT-DVODIST)/docs.php \
+$(TGT-DVODIST)/help.php \
+$(TGT-DVODIST)/ipp.css
 
-include $(SRC-ROOT)/3pi.20120509/Makefile
-include $(SRC-ROOT)/3pi.20120525/Makefile
-include $(SRC-ROOT)/3pi.20120606/Makefile
-include $(SRC-ROOT)/allsky.tables.20120513/Makefile
-include $(SRC-ROOT)/allsky.tables.20120602/Makefile
-include $(SRC-ROOT)/ubercal.data/Makefile
+IPPDATA = \
+$(TGT-UTIL)/ippdata.menu.dat \
+$(TGT-UTIL)/ippdata.page.php \
+$(TGT-IPPDATA)/PScolorlogo2.jpg \
+$(TGT-IPPDATA)/index.php \
+$(TGT-IPPDATA)/test.php \
+$(TGT-IPPDATA)/docs.php \
+$(TGT-IPPDATA)/help.php \
+$(TGT-IPPDATA)/ipp.css
 
-DIST = \
+include $(SRC-DVODIST)/3pi.20120509/Makefile
+include $(SRC-DVODIST)/3pi.20120525/Makefile
+include $(SRC-DVODIST)/3pi.20120606/Makefile
+include $(SRC-DVODIST)/allsky.tables.20120513/Makefile
+include $(SRC-DVODIST)/allsky.tables.20120602/Makefile
+include $(SRC-DVODIST)/ubercal.data/Makefile
+
+DVODIST_DIRS = \
 $(DIST-3pi-20120509) \
 $(DIST-3pi-20120525) \
@@ -51,12 +64,8 @@
 $(DIST-ubercal-data)
 
-php: $(ROOT) $(UTIL) $(PROG)
-dist: $(DIST)
+dvodist-all: $(UTIL) $(DVODIST) $(DVODIST_DIRS)
+dvodist: $(UTIL) $(DVODIST)
 
-# 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
+ippdata: $(UTIL) $(IPPDATA)
 
 # mkd files are used to generate php files
@@ -66,19 +75,32 @@
 	$(GENERATE) --htdocs @HTDOCS@ $(SRC-UTIL)/$*.mkd $(TGT-UTIL)/$*.php || 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
-
-# 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-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
+
+# mkd files are used to generate php files
+$(TGT-DVODIST)/%.php: $(SRC-DVODIST)/%.mkd
+	@if [ ! -d $(TGT-DVODIST) ]; then mkdir -p $(TGT-DVODIST) || exit; fi
+	rm -f $(TGT-DVODIST)/$*.php || exit
+	$(GENERATE) --htdocs @HTDOCS@ $(SRC-DVODIST)/$*.mkd $(TGT-DVODIST)/$*.php || exit
+
+# non-generated php code is copied directly
+$(TGT-DVODIST)/%: $(SRC-DVODIST)/%
+	@if [ ! -d $(TGT-DVODIST) ]; then mkdir -p $(TGT-DVODIST) || exit; fi
+	cp $(SRC-DVODIST)/$* $(TGT-DVODIST)/$* || exit
+	chmod +x $(TGT-DVODIST)/$* || exit
+
+# mkd files are used to generate php files
+$(TGT-IPPDATA)/%.php: $(SRC-IPPDATA)/%.mkd
+	@if [ ! -d $(TGT-IPPDATA) ]; then mkdir -p $(TGT-IPPDATA) || exit; fi
+	rm -f $(TGT-IPPDATA)/$*.php || exit
+	$(GENERATE) --htdocs @HTDOCS@ $(SRC-IPPDATA)/$*.mkd $(TGT-IPPDATA)/$*.php || exit
+
+# non-generated php code is copied directly
+$(TGT-IPPDATA)/%: $(SRC-IPPDATA)/%
+	@if [ ! -d $(TGT-IPPDATA) ]; then mkdir -p $(TGT-IPPDATA) || exit; fi
+	cp $(SRC-IPPDATA)/$* $(TGT-IPPDATA)/$* || exit
+	chmod +x $(TGT-IPPDATA)/$* || exit
 
 # utilities #################################################
@@ -95,2 +117,13 @@
 .PRECIOUS: $(SRC)/%.jpg
 .PRECIOUS: $(SRC)/%.jpeg
+
+
+# these are the scripts used to generate the index listings
+# probably do not need to install these (not used by the web ui)
+PROG = \
+$(SRC-PROG)/mkdist.20120509.sh \
+$(SRC-PROG)/mkdist.20120525.sh \
+$(SRC-PROG)/mkdist.20120606.sh \
+$(SRC-PROG)/mkdist.testcat.sh \
+$(SRC-PROG)/mkindex.sh
+