commit 814a9e58ee9e9031cdcf0b3ec6845e9c60bc11a8 Author: David Fifield david@bamsoftware.com Date: Sat Apr 6 19:00:11 2013 -0700

Use bundle-torrc-gnulinux in the current directory.

This conceptually belongs to the same directory as Makefile, which only happens to currently be in the flashproxy repository. These bundle files should be moved somewhere else and these files should go together. --- doc/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile index 9ebd485..06cc9e7 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -61,7 +61,7 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): cp "$(PYOBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/PyObfsproxy find "$(TBBDIR)"/App -name '*.pyc' | xargs rm -f

- cat "$(FLASHPROXY_HOME)"/doc/bundle-torrc-gnulinux >> "$(TBBDIR)"/Data/Tor/torrc + cat bundle-torrc-gnulinux >> "$(TBBDIR)"/Data/Tor/torrc

tar czf "$@" -C "$(WORKDIR)" tor-browser_en-US