Changeset 35946

Timestamp:

Aug 14, 2013, 4:53:59 PM (13 years ago)

Author:

eugene

Message:

move the common htdoc files to www-util and adjust make rules so they install correctly

Location:

branches/eam_branches/ipp-20130711/dvodist

Files:

• Makefile.in (modified) (5 diffs)
• ippdata/PScolorlogo2.jpg (deleted)
• ippdata/index.mkd (modified) (2 diffs)
• ippdata/ipp.css (deleted)
• www-util/PScolorlogo2.jpg (moved) (moved from branches/eam_branches/ipp-20130711/dvodist/dvodist/PScolorlogo2.jpg )
• www-util/ipp.css (moved) (moved from branches/eam_branches/ipp-20130711/dvodist/dvodist/ipp.css )

branches/eam_branches/ipp-20130711/dvodist/Makefile.in

@@ -27 +27 @@
 
 # generated common code used by all installations
-UTIL-MKD = \
+UTIL = \
 $(TGT-UTIL)/ipp.page.php \
 $(TGT-UTIL)/ipp.php \
 $(TGT-UTIL)/markdown.php \
 $(TGT-UTIL)/phptest.php
-
-# static common code used by all installations
-UTIL-RAW = \
-$(TGT-UTIL)/blank.html \
-$(TGT-UTIL)/ipp.menu.dat
-
-UTIL = $(UTIL-RAW) $(UTIL-MKD)
 
 # pages which are generated (and thus depend on the config)
@@ -53 +46 @@
 # pages which are copied directly
 DVODIST-RAW = \
-$(TGT-UTIL)/dvodist.menu.dat \
+$(TGT-DVODIST)/blank.html \
 $(TGT-DVODIST)/PScolorlogo2.jpg \
-$(TGT-DVODIST)/ipp.css
+$(TGT-DVODIST)/ipp.css \
+$(TGT-UTIL)/dvodist.menu.dat 
 
 DVODIST = $(DVODIST-MKD) $(DVODIST-RAW) 
@@ -76 +70 @@
 IPPDATA-RAW = \
 $(TGT-UTIL)/ippdata.menu.dat \
+$(TGT-IPPDATA)/blank.html \
+$(TGT-IPPDATA)/ipp.css \
 $(TGT-IPPDATA)/PScolorlogo2.jpg \
 $(TGT-IPPDATA)/docs/photladder-1206.20130301.pdf \
@@ -119 +115 @@
         $(GENERATE) $(SRC-UTIL)/$*.mkd $(TGT-UTIL)/$*.php || exit
 
+# non-generated common utilities (not dest for htdocs)
 $(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
+
+#### dvodist
+
+# common non-generated code from a common location
+$(TGT-DVODIST)/%: $(SRC-UTIL)/%
+        @if [ ! -d $(TGT-DVODIST) ]; then mkdir -p $(TGT-DVODIST) || exit; fi
+        cp $(SRC-UTIL)/$* $(TGT-DVODIST)/$* || exit
+        chmod +x $(TGT-DVODIST)/$* || exit
 
 # mkd files are used to generate php files
@@ -135 +140 @@
         cp $(SRC-DVODIST)/$* $(TGT-DVODIST)/$* || exit
         chmod +x $(TGT-DVODIST)/$* || exit
+
+#### ippdata
+
+# common non-generated code from a common location
+$(TGT-IPPDATA)/%: $(SRC-UTIL)/%
+        @if [ ! -d $(TGT-IPPDATA) ]; then mkdir -p $(TGT-IPPDATA) || exit; fi
+        cp $(SRC-UTIL)/$* $(TGT-IPPDATA)/$* || exit
+        chmod +x $(TGT-IPPDATA)/$* || exit
 
 # mkd files are used to generate php files

branches/eam_branches/ipp-20130711/dvodist/ippdata/index.mkd

@@ -26 +26 @@
 which make use of data from Pan-STARRS 1:**
 
-> The Pan-STARRS1 (PS1) Surveys have been made possible through
+> The Pan-STARRS1 Surveys (PS1) have been made possible through
 contributions of the Institute for Astronomy, the University of
 Hawaii, the Pan-STARRS Project Office, the Max-Planck Society and its
@@ -38 +38 @@
 the National Aeronautics and Space Administration under Grant
 No. NNX08AR22G issued through the Planetary Science Division of the
-NASA Science Mission Directorate and the University of Maryland.
-
+NASA Science Mission Directorate, the National Science Foundation
+under Grant No. AST-1238877, the University of Maryland, and Eotvos
+Lorand University (ELTE).
 
 @ Data Product                : none                       : plain : title : Comment