diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-11-23 00:05:24 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-11-23 00:05:24 -0500 |
| commit | 076d2a0e117f4174ac903a73b53656fbfee5a16f (patch) | |
| tree | 68f7c74341bdbc241ce10a307a86e78c6f02ba04 | |
| parent | 05319e4d597e687d660c5ef8edd1bb00108b5ab8 (diff) | |
| parent | 2d6ee53fb91a34e84d082393fd7cd8f6159b5ced (diff) | |
| download | tor-076d2a0e117f4174ac903a73b53656fbfee5a16f.tar.gz tor-076d2a0e117f4174ac903a73b53656fbfee5a16f.zip | |
Merge branch 'maint-0.2.1' into release-0.2.1
| -rw-r--r-- | changes/remove-website | 5 | ||||
| -rw-r--r-- | doc/Makefile.am | 21 |
2 files changed, 6 insertions, 20 deletions
diff --git a/changes/remove-website b/changes/remove-website new file mode 100644 index 0000000000..ecbfbf9bc2 --- /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 60afcb7d52..79123d81d5 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 |