From 55ca3927e907013a4ba3383b6bb41e68d18ac896 Mon Sep 17 00:00:00 2001
From: Andrew Lewman <andrew@torproject.org>
Date: Thu, 16 Feb 2006 22:00:46 +0000
Subject: [PATCH] Fix up Makefile.am for the rpm target_cpu and target_os
 implementation.

svn:r6024
---
 Makefile.am | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c0a5200c91..809e26770f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,10 +23,9 @@ dist-rpm: dist
 	    mkdir $$RPM_BUILD_DIR/$$subdir;                     \
 	done;                                                   \
 	cp tor-$(VERSION).tar.gz $$RPM_BUILD_DIR/SOURCES;       \
-	rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR"	tor.spec;
-#	   $$RPMBUILD_OPTIONS tor.spec; 			\
+	rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR"	tor.spec; \
 	mv $$RPM_BUILD_DIR/SRPMS/* .;                           \
-	mv $$RPM_BUILD_DIR/RPMS/*/* .;                          \
+	mv $$RPM_BUILD_DIR/RPMS/* .;				\
 	rm -rf $$RPM_BUILD_DIR
 
 dist-osx: