From 80c6f3e75f1c956737a6a97d11fc069881967dde Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Tue, 31 Aug 2010 01:46:18 -0300
Subject: [PATCH] Fix two bugs left from the great reorganization.

- Makefile (UPLOAD): updated for new directory structure
- scripts/schhist2web: unchanged Postscript files were not replaced with
  symlinks because the symlink paths were wrong
---
 scripts/Makefile    | 10 +++++-----
 scripts/schhist2web |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/Makefile b/scripts/Makefile
index 767652a..448460c 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,8 +1,8 @@
 SHELL = /bin/bash
 
-UPLOAD = {index.html,unchanged.png,thumb_*,diff_*,pdf_*,html_*}
+CACHE_DIRS = {ppm0,ppm1,ppm2,ps}
 DEST = werner@host:/home/httpd/almesberger/misc/ben/
-RSYNC = rsync -a --progress
+RSYNC = eval rsync -a --progress "--exclude "$(CACHE_DIRS)/
 
 .PHONY:		all ben-wpan-schhist ben-wpan-schhist-upload
 .PHONY:		xue-schhist xue-schhist-upload
@@ -24,7 +24,7 @@ ben-wpan-schhist:
 	  ./schhist2web atrf/wpan-atrf.sch
 
 ben-wpan-schhist-upload:
-	 $(RSYNC) _out/$(UPLOAD) $(DEST)/demo/
+	 $(RSYNC) _out/* $(DEST)/demo/
 
 xue-schhist:
 	SCHHIST_TITLE=Xue \
@@ -33,7 +33,7 @@ xue-schhist:
 	  ./schhist2web -S ../../xue kicad/xue-rnc/xue-rnc.sch _xue
 
 xue-schhist-upload:
-	 $(RSYNC) _xue/$(UPLOAD) $(DEST)/demo2/
+	 $(RSYNC) _xue/* $(DEST)/demo2/
 
 cntr-schhist:
 	SCHHIST_TITLE=ben-wpan/cntr \
@@ -42,4 +42,4 @@ cntr-schhist:
 	  ./schhist2web cntr/cntr.sch _cntr
 
 cntr-schhist-upload:
-	$(RSYNC) _cntr/$(UPLOAD) $(DEST)/demo3/
+	$(RSYNC) _cntr/* $(DEST)/demo3/
diff --git a/scripts/schhist2web b/scripts/schhist2web
index 274355f..3350ea6 100755
--- a/scripts/schhist2web
+++ b/scripts/schhist2web
@@ -250,7 +250,7 @@ for n in $first `cd "$dir" && git rev-list --reverse $first..HEAD`; do
 		    symlink "../../$head/$d/${m##*/}" "$cache/$n/$d/${m##*/}"
 		done
 		m_ps=${m%.ppm}.ps
-		symlink "../../$head/$d/${m_ps##*/}" "$cache/$n/$d/${m_ps##*/}"
+		symlink "../../$head/ps/${m_ps##*/}" "$cache/$n/ps/${m_ps##*/}"
 	    fi
 	fi
 	touch "$out/names/`basename \"$m\" .ppm`"