aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-11-04 22:46:38 +0000
committerNick Mathewson <nickm@torproject.org>2004-11-04 22:46:38 +0000
commit311695e279ec8f56ce255cf5e6ea175e11fa9ced (patch)
tree7f17506beb0f4a88a38f77db90c6215747a86f07
parentb56ef496d9af0107cf2278cf225f1c8189b194a9 (diff)
downloadtor-311695e279ec8f56ce255cf5e6ea175e11fa9ced.tar
tor-311695e279ec8f56ce255cf5e6ea175e11fa9ced.tar.gz
Finish applying jbash patch to Makefile.am; make dist-rpm work again
svn:r2682
-rw-r--r--Makefile.am8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index bdea18310..785b88eb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,11 +14,13 @@ dist-rpm: dist
rm -rf /tmp/tor-rpm-build
mkdir /tmp/tor-rpm-build
for subdir in BUILD RPMS SOURCES SPECS SRPMS; do \
- mkdir /tmp/tor-rpm-build/$$subdir; \
+ mkdir /tmp/tor-rpm-build/$$subdir; \
done
cp tor-$(VERSION).tar.gz /tmp/tor-rpm-build/SOURCES
- rpmbuild -ba --define '_topdir /tmp/tor-rpm-build' contrib/tor.spec
- mv /tmp/tor-rpm-build/*RPMS/* .
+ rpmbuild -ba --define '_topdir /tmp/tor-rpm-build' tor.spec
+ mv /tmp/tor-rpm-build/SRPMS/* .
+ mv /tmp/tor-rpm-build/RPMS/*/* .
+ rm -rf /tmp/tor-rpm-build
doxygen:
doxygen && cd doc/doxygen/latex && make