[or-cvs] Fix up Makefile.am for the rpm target_cpu and target_os imp...

[phobos at seul.org]

Update of /home/or/cvsroot/tor
In directory moria:/tmp/cvs-serv2401

Modified Files:
	Makefile.am 
Log Message:
Fix up Makefile.am for the rpm target_cpu and target_os implementation.


Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -d -r1.21 -r1.22
--- Makefile.am	16 Feb 2006 21:53:18 -0000	1.21
+++ Makefile.am	16 Feb 2006 22:00:46 -0000	1.22
@@ -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: