diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-12-18 23:04:55 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-12-18 23:04:55 +0000 |
| commit | 0e9f77b9d8a150953cacc086b89d7884715d1366 (patch) | |
| tree | 2a306fa4472018a600f41d5bbbf17b5d1e20e610 /Makefile.am | |
| parent | c1ccb63a37596ecafc604f5062f80cd881e899ff (diff) | |
| download | tor-0e9f77b9d8a150953cacc086b89d7884715d1366.tar.gz tor-0e9f77b9d8a150953cacc086b89d7884715d1366.zip | |
Forward-port last RPM change to mainline
svn:r3178
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index bcb3f22252..1e1013e6dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,16 +11,18 @@ EXTRA_DIST = INSTALL README AUTHORS LICENSE ChangeLog tor.spec tor.spec.in # $(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor 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; \ - done - cp tor-$(VERSION).tar.gz /tmp/tor-rpm-build/SOURCES - 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 + RPM_BUILD_DIR="/tmp/tor-rpm-build-$$$$"; \ + rm -rf $$RPM_BUILD_DIR; \ + mkdir $$RPM_BUILD_DIR || exit 1; \ + for subdir in BUILD RPMS SOURCES SPECS SRPMS; do \ + mkdir $$RPM_BUILD_DIR/$$subdir; \ + done; \ + cp tor-$(VERSION).tar.gz $$RPM_BUILD_DIR/SOURCES; \ + rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" \ + $$RPMBUILD_OPTIONS tor.spec; \ + mv $$RPM_BUILD_DIR/SRPMS/* .; \ + mv $$RPM_BUILD_DIR/RPMS/*/* .; \ + rm -rf $$RPM_BUILD_DIR doxygen: doxygen && cd doc/doxygen/latex && make |