[Pkg-octave-commit] rev 219 - trunk/www

[Rafael Laboissiere]

Author: rafael
Date: 2005-06-08 16:23:54 +0000 (Wed, 08 Jun 2005)
New Revision: 219

Modified:
   trunk/www/Makefile
Log:
* Removed some unused variables
* Make a target for the tmp.tgz tarball (depends on the installed files)
* Make install target depend on the tarball
* Added rule for building DOG-Guidelines.html from *.txt

Modified: trunk/www/Makefile
===================================================================
--- trunk/www/Makefile	2005-06-08 16:21:40 UTC (rev 218)
+++ trunk/www/Makefile	2005-06-08 16:23:54 UTC (rev 219)
@@ -10,42 +10,43 @@
 GROUP = pkg-octave
 HOST = alioth.debian.org
 DIR = /org/alioth.debian.org/chroot/home/groups/pkg-octave/htdocs/
-GUIDELINES = DOG-Guidelines.txt
 ICONS = $(shell ls icons/*.png)
-CSS = dog.css
-COMMONFILES = $(GUIDELINES) $(ICONS) $(CSS)
-INSTALLFILES = index.html $(COMMONFILES)
-SRCFILES = index.html.in $(COMMONFILES) Makefile
+CSS = dog.css guidelines.css common.css
+INSTALLFILES = index.html DOG-Guidelines.html $(ICONS) $(CSS)
 TARBALL = tmp.tgz
 
-install: svn-ci index.html
-	@echo -n "Making tarball... "
-	@tar cfz $(TARBALL) $(INSTALLFILES)
-	@echo done
+install: svn-ci $(TARBALL)
 	@echo -n "Uploading tarball to web site... "
 	@scp -q $(TARBALL) $(USER)@$(HOST):$(DIR)
 	@echo done
-	@rm -f $(TARBALL)
 	@echo -n "Installing remote tarball... "
 	@ssh $(USER)@$(HOST) 'cd $(DIR); tar xfz $(TARBALL)'
 	@echo done
 	@echo -n "Setting group access of www files... "
 	-@ssh $(USER)@$(HOST)						\
 		'cd $(DIR); chgrp -R $(GROUP) .; chmod -R g=u .'	\
-		> /dev/null 2>&1 
+		> /dev/null 2>&1
 	@echo done
 	@echo -n "Removing remote tarball... "
 	@ssh $(USER)@$(HOST) rm -f $(DIR)$(TARBALL)
 	@echo done
 
-%: %.in
+%.html: %.html.in
 	eperl $< > $@
 
+%.html: %.txt
+	rest2html --no-toc-backlinks --stylesheet=guidelines.css $< $@
+
+$(TARBALL): $(INSTALLFILES)
+	@echo -n "Making tarball... "
+	@tar cfz $(TARBALL) $(INSTALLFILES)
+	@echo done
+
 svn-ci:
 	svn ci
 	svn up
 
 clean:
-	rm -f index.html
+	rm -f index.html DOG-Guidelines.html $(TARBALL)
 
 .PHONY: install svn-ci clean