sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.1' into release-0.2.1

This commit is contained in:
Roger Dingledine 2010-11-23 00:05:24 -05:00
parent 05319e4d59 2d6ee53fb9
commit 076d2a0e11
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/remove-website Normal file
View File

@ -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.

21
doc/Makefile.am
View File

@ -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