stop shipping doc/img and doc/website in the tarball

diff --git a/changes/remove-website b/changes/remove-website
new file mode 100644 (file)
index 0000000..ecbfbf9
--- /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 60afcb7d5216cbfb60cbdf24f3f5d2a46ce995ec..79123d81d59d0e79b352f2356ae94d82306c5cd3 100644 (file)
--- 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