r956 - html/trunk/scripts

lizardo at linuxfromscratch.org lizardo at linuxfromscratch.org
Sat Feb 5 17:18:13 PST 2005


Author: lizardo
Date: 2005-02-05 18:18:11 -0700 (Sat, 05 Feb 2005)
New Revision: 956

Modified:
   html/trunk/scripts/update-website.mk
Log:
Fixed update-website.mk.


Modified: html/trunk/scripts/update-website.mk
===================================================================
--- html/trunk/scripts/update-website.mk	2005-02-06 01:06:34 UTC (rev 955)
+++ html/trunk/scripts/update-website.mk	2005-02-06 01:18:11 UTC (rev 956)
@@ -151,14 +151,16 @@
 
 mirrors-list: index.html $(INDEXES)
 
-index.html $(INDEXES): mirrorlist.html
+index.html: mirrorlist.html $(TEMPLATES)/index-*.html
 	cat $(TEMPLATES)/index-top.html \
 	mirrorlist.html \
 	$(TEMPLATES)/index-bottom.html > index.html
+
+$(INDEXES): mirrorlist.html $(foreach i,$(PROJS),$(TEMPLATES)/$(i)/index-*.html)
 	for i in $(PROJS); do \
-    cat $(TEMPLATES)/$$i/index-top.html > $$i/index.html; \
-    sed "s@/lfs/news.html@/$$i/news.html at g" mirrorlist.html >> $$i/index.html; \
-    cat $(TEMPLATES)/$$i/index-bottom.html >> $$i/index.html; done
+	cat $(TEMPLATES)/$$i/index-top.html > $$i/index.html; \
+	sed "s@/lfs/news.html@/$$i/news.html at g" mirrorlist.html >> $$i/index.html; \
+	cat $(TEMPLATES)/$$i/index-bottom.html >> $$i/index.html; done
 
 ###########################################
 # Update project-specific website sections
@@ -222,6 +224,6 @@
 # "$(find -maxdepth 1 -mindepth 1)" excludes WWW_WC itself from the sync,
 # avoiding "Operation not permitted" errors
 run-rsync:
-	test -n "$(TARGETDIR)" && \
-	rsync -a --delete --exclude-from=scripts/rsync-ignore \
+	test -n "$(TARGETDIR)"
+	rsync -av --delete --exclude-from=scripts/rsync-ignore \
 	$$(find -maxdepth 1 -mindepth 1) $(TARGETDIR)/




More information about the website mailing list