diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-07-24 18:18:25 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-07-24 18:37:12 -0400 |
| commit | c3274c4c430ac8e55b9ded0d939215c281991682 (patch) | |
| tree | aa8a64bab16318cf8a1bdd02d4fc094ca1264ef3 /Makefile.am | |
| parent | f80537e3e079ffa18f3b42aff05848fe0407171a (diff) | |
| parent | 52b142219b9ed4b3de8fee4bc09b229cb3f7b410 (diff) | |
| download | tor-c3274c4c430ac8e55b9ded0d939215c281991682.tar.gz tor-c3274c4c430ac8e55b9ded0d939215c281991682.zip | |
Merge branch 'maint-0.2.1' into master
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 55a01e421c..aa679e556e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,15 +25,14 @@ dist-rpm: mkdir $$RPM_BUILD_DIR/$$subdir; \ done; \ mkdir $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION); \ - cp -R ./ $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION)/; \ - pushd $$RPM_BUILD_DIR/SOURCES/; \ - tar zcf tor-$(VERSION).tar.gz ./; \ - popd; \ - rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \ - mv $$RPM_BUILD_DIR/SRPMS/* .; \ - mv $$RPM_BUILD_DIR/RPMS/* .; \ - rm -rf $$RPM_BUILD_DIR - + cp -R ./ $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION)/; \ + pushd $$RPM_BUILD_DIR/SOURCES/; \ + tar zcf tor-$(VERSION).tar.gz ./; \ + popd; \ + LIBS=-lrt rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \ + mv $$RPM_BUILD_DIR/SRPMS/* .; \ + mv $$RPM_BUILD_DIR/RPMS/* .; \ + rm -rf $$RPM_BUILD_DIR dist-osx: @if [ "x$(prefix)" != 'x/Library/Tor' ]; then \ |