diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:59:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-11 13:59:18 -0500 |
| commit | 2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd (patch) | |
| tree | d6786b027903624576e2f8861a68e665d0fbbb9b /Makefile.am | |
| parent | a29596556c60fbbf687b1af48b9e6646b25f208e (diff) | |
| parent | 5beb8ee4e1889346dc9bec5f866b14809a2d6983 (diff) | |
| download | tor-2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd.tar.gz tor-2b4ed1d07e5b03f368ccc23e44c2189d5dedc3fd.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
configure.in
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 5caae4cdc6..5a7f31e205 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,25 +35,6 @@ dist-rpm: mv $$RPM_BUILD_DIR/RPMS/* .; \ rm -rf $$RPM_BUILD_DIR -dist-osx: - @if [ "x$(prefix)" != 'x/Library/Tor' ]; then \ - echo "Configure with --prefix=/Library/Tor, please"; \ - exit 1; \ - fi; \ - if [ "x$(bindir)" != 'x/Library/Tor' ]; then \ - echo "Configure with --bindir=/Library/Tor, please"; \ - exit 1; \ - fi; \ - if [ "x$(sysconfdir)" != 'x/Library' ]; then \ - echo "Configure with --sysconfdir=/Library, please"; \ - exit 1; \ - fi; \ - if [ "x$(CONFDIR)" != 'x/Library/Tor' ]; then \ - echo "Configure with CONFDIR=/Library/Tor, please"; \ - fi - $(MAKE) all - VERSION=$(VERSION) sh ./contrib/osx/package.sh - dist: check doxygen: |