Merge branch 'master' of /users/www/www/

Makefile

@@ -26,7 +26,7 @@ books.xml:
 	echo '</booklist>' >> $@
 
 events.ics:
-	perl xml2ics.pl events.xml > events.ics
+	perl scripts/xml2ics.pl events.xml > events.ics
 
 include default.mk
 

clubs/index.xml

@@ -42,7 +42,7 @@
     <li><a href="http://www.mathsoc.uwaterloo.ca/">The Mathematics Society (MathSoc)</a></li>
     <li><a href="http://csclub.uwaterloo.ca/~ndp/">UW New Democratic Party Club</a></li>
     <li>Ontario Sikh Students Association</li>
-    <li><a href="http://www.undergrad.math.uwaterloo.ca/%7Epmclub/">Pure Math, Applied Math, and C&amp;O Club</a></li>
+    <li><a href="http://www.student.math.uwaterloo.ca/~pmclub/">Pure Math, Applied Math, and C&amp;O Club</a></li>
     <li><a href="http://csclub.uwaterloo.ca/~skiclub/">UW Ski Club</a></li>
     <li><a href="http://csclub.uwaterloo.ca/~spanish/">UW Spanish Club</a></li>
     <li><a href="http://csclub.uwaterloo.ca/~spp/">Student Programming Project</a></li>

cow/.gitignore

@@ -1,2 +1,4 @@
 *.o
-/cow
+/i686
+/x86_64
+/alpha

cow/Makefile

@@ -1,10 +1,17 @@
-MAIN = cow
+ARCH=$(shell uname -m)
+MAIN = $(ARCH)/cow
 CFLAGS = -I/usr/include/libxml2 -DDEBUG -pedantic -ansi -Wall
 LDFLAGS = $(CFLAGS) -lxml2 -lxslt
 SOURCES = $(wildcard *.c)
-OBJECTS = $(SOURCES:.c=.o)
+OBJECTS = $(addprefix $(ARCH)/,$(SOURCES:.c=.o))
 
 all: $(MAIN)
 
+$(ARCH):
+	mkdir -p $(ARCH)
+
 $(MAIN): $(OBJECTS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJECTS)
+
+$(ARCH)/%.o: %.c $(ARCH)
+	$(CC) -c $(CFLAGS) -o $@ $<

cow/cow

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec "$(dirname $0)/$(uname -m)/$(basename $0)" "$@"

media/index.xml

@@ -11,7 +11,7 @@
     CD or DVD should you so choose.
     <ul>
 
-<mediaitem title="PMAMC&amp;OC SASMS - Spring 2007">
+<mediaitem title="PMAMC&amp;OC SASMS - Spring 2007" buttons="true">
   <mediafile file="pmc-sasms-spring-2007.avi" type="XviD" size="643M" />
   <mediafile file="pmc-sasms-spring-2007.ogg" type="OGG/Theora" size="598M" />
   <mediafile file="pmc-sasms-spring-2007.mp4" type="MP4" size="625M" />