r856 - trunk/scripts

lizardo at linuxfromscratch.org lizardo at linuxfromscratch.org
Sun Oct 24 12:20:55 PDT 2004


Author: lizardo
Date: 2004-10-24 13:20:53 -0600 (Sun, 24 Oct 2004)
New Revision: 856

Modified:
   trunk/scripts/update-website.mk
Log:
Simplified update-website.mk. Testing post-commit again.



Modified: trunk/scripts/update-website.mk
===================================================================
--- trunk/scripts/update-website.mk	2004-10-24 18:51:03 UTC (rev 855)
+++ trunk/scripts/update-website.mk	2004-10-24 19:20:53 UTC (rev 856)
@@ -1,15 +1,23 @@
 #!/usr/bin/make -f
 
-# Usage: first run "update-website.mk svn-checkout" to create an initial
-# repository on TARGETDIR, if it does not exist yet. To update the website,
-# run update-website.mk without arguments.
+# Usage: first run
+#
+#	./update-website.mk TARGETDIR="<target_dir>" svn-checkout
+#
+# to create an initial repository on TARGETDIR, if it does not exist yet. To
+# update the website manually (usually this will be done by a post-commit hook
+# script) run
+#
+#	cd "<target_dir>" &&
+#	./scripts/update-website.mk svn-update &&
+#	./scripts/update-website.mk update-website
+#
 
 SVN = svn://svn.linuxfromscratch.org
 REV = HEAD
 
-# TARGETDIR must be configured by editing the "targetdir" property of the
-# svn://svn.linuxfromscratch.org/www repository
-#TARGETDIR = /home/httpd/www.linuxfromscratch.org
+# Assuming we are already on TARGETDIR
+TARGETDIR = $(PWD)
 
 # Mirrors to which the website will be pushed through rsync
 #MIRRORS = jenacon.net
@@ -30,17 +38,7 @@
 # Current year
 YEAR = $(shell date +%Y)
 
-ifeq ($(TARGETDIR),)
-no-targetdir:
-	$(error TARGETDIR is not defined)
-endif
-
-ifneq ($(PWD),$(TARGETDIR))
-pwd-check:
-	$(error You should run this script from $(TARGETDIR))
-endif
-
-update-website: backup svn-update news-archive svnlog website.html news-html news-rss \
+update-website: backup news-archive svnlog website.html news-html news-rss \
 	mirrors-list update-patches update-hints error-pages set-perms run-rsync
 # Add the timestamp for mirrors
 	mkdir -p timestamp




More information about the website mailing list