[Super-tux-commit] htdocs Makefile,1.16,1.17

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6816

Modified Files:
	Makefile 
Log Message:
- touched up Makefile for website

Index: Makefile
===================================================================
RCS file: /cvsroot/super-tux/htdocs/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	5 May 2004 15:33:33 -0000	1.16
+++ Makefile	17 May 2004 00:52:40 -0000	1.17
@@ -24,6 +24,10 @@
   milestone1/misc.html
 
 OUTFILES=$(patsubst %,output/%,$(HTMLOUT)) 
+USERNAME=`cat CVS/Root | sed "s/:[^:]*:\([^:@]*\)@[^:]*:.*/\1/"`
+XALAN_VERSION_X=`xalan 2>&1 | head -n 1 | sed "s/\./ /g" | awk '{print $$3}'`
+XALAN_VERSION_Y=`xalan 2>&1 | head -n 1 | sed "s/\./ /g" | awk '{print $$4}'`
+XALAN_VERSION_Z=`xalan 2>&1 | head -n 1 | sed "s/\./ /g" | awk '{print $$5}'`
 
 all: content
 
@@ -37,21 +41,27 @@
         echo Section: $$SECTION ; \
         if [ "x$$SECTION" = "xsfnet" -o "x$$SECTION" = "x." ]; then BASEDIR=""; \
 	else BASEDIR="../"; fi; \
+	if [ $(XALAN_VERSION_X) -eq 1 -a $(XALAN_VERSION_Y) -ge 7 ]; then \
+            XALAN_PARAM="-p"; \
+            XALAN_IN=""; \
+            XALAN_OUT="-o"; \
+            XALAN_XSL=""; \
+        else \
+            XALAN_PARAM="-PARAM"; \
+            XALAN_IN="-IN"; \
+            XALAN_OUT="-OUT"; \
+            XALAN_XSL="-XSL"; \
+        fi; \
 	xalan \
-          -PARAM filename   "'$${FILENAME%%.xml}'" \
-          -PARAM section    "'$${SECTION}'" \
-          -PARAM lastchange "'$${LASTCHANGE}'" \
-          -PARAM basedir    "'$${BASEDIR}'" \
-          -IN $< \
-          -OUT $@ \
-          -XSL default.xsl
+          $$XALAN_PARAM filename   "'$${FILENAME%%.xml}'" \
+          $$XALAN_PARAM section    "'$${SECTION}'" \
+          $$XALAN_PARAM lastchange "'$${LASTCHANGE}'" \
+          $$XALAN_PARAM basedir    "'$${BASEDIR}'" \
+          $$XALAN_OUT $@ \
+          $$XALAN_IN $< \
+          $$XALAN_XSL default.xsl
 
-content: $(OUTFILES) development/default.css
-	mkdir -p output
-	mkdir -p output/development/
-	mkdir -p output/milestone1/
-	mkdir -p output/development/images/
-	mkdir -p output/milestone1/images/
+content: directories $(OUTFILES) development/default.css
 	cp -v output/welcome.html output/index.html
 	cp -v default.css output/
 	cp -v images/*.jpg output/images/
@@ -59,10 +69,27 @@
 	cp -v milestone1/images/*.jpg output/milestone1/images/
 	cp -v milestone1/images/*.png output/milestone1/images/
 	cp -v milestone1/images/*.gif output/milestone1/images/
+	#cp -v milestone2/images/*.jpg output/milestone2/images/
+	#cp -v milestone2/images/*.png output/milestone2/images/
+	#cp -v milestone2/images/*.gif output/milestone2/images/
 	cp -v development/images/*.jpg output/development/images/
 	cp -v development/images/*.png output/development/images/
 
+directories:
+	mkdir -p output
+	mkdir -p output/development/
+	mkdir -p output/milestone1/
+	mkdir -p output/milestone2/
+	mkdir -p output/images/
+	mkdir -p output/development/images/
+	mkdir -p output/milestone1/images/
+	#mkdir -p output/milestone2/images/
+
+
 upload: content
-	rsync -rv -e ssh output/ gr...@su...:/home/groups/s/su/super-tux/htdocs/
+	echo rsync -rv -e ssh output/ $(USERNAME)@super-tux.sourceforge.net:/home/groups/s/su/super-tux/htdocs/
+
+clean:
+	rm -rf output/*
 
 # EOF #