From 2d6ee53fb91a34e84d082393fd7cd8f6159b5ced Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Tue, 23 Nov 2010 00:03:50 -0500
Subject: [PATCH] stop shipping doc/img and doc/website in the tarball

---
 changes/remove-website |  5 +++++
 doc/Makefile.am        | 21 +--------------------
 2 files changed, 6 insertions(+), 20 deletions(-)
 create mode 100644 changes/remove-website

diff --git a/changes/remove-website b/changes/remove-website
new file mode 100644
index 000000000..ecbfbf9bc
--- /dev/null
+++ b/changes/remove-website
@@ -0,0 +1,5 @@
+  o Removed files:
+    - Stop shipping the old doc/website/ directory in the tarball. We
+      changed the website format in late 2010, and what we shipped in
+      0.2.1.26 really wasn't that useful anyway.
+
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 60afcb7d5..79123d81d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 
-EXTRA_DIST = website img HACKING                             \
+EXTRA_DIST = HACKING                                         \
              tor-resolve.1 tor-gencert.1                     \
              tor-osx-dmg-creation.txt tor-rpm-creation.txt   \
              tor-win32-mingw-creation.txt
@@ -10,22 +10,3 @@ SUBDIRS = design-paper spec
 
 DIST_SUBDIRS = design-paper spec
 
-website: ../../website/docs/
-	rm -rf website
-	mkdir website
-	if test -d $(srcdir)/../../website ; then \
-		cd $(srcdir)/../../website && $(MAKE); \
-	fi
-	if test -d $(srcdir)/../../website ; then \
-		cp $(srcdir)/../../website/docs/tor-*.html.* \
-			$(srcdir)/../../website/stylesheet.css website; \
-	fi
-img: ../../website/img/
-	rm -rf img
-	mkdir img
-#	if test -d $(srcdir)/../../website/img; then \
-#		cp $(srcdir)/../../website/img/*.png \
-#			$(srcdir)/../../website/img/*.jpg img; \
-#	fi
-
-.PHONY: website img