[or-cvs] backport dist-rpm changes

[phobos@xxxxxxxx]

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

Modified Files:
      Tag: tor-0_1_1-patches
	Makefile.am 
Log Message:
backport dist-rpm changes


Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/Makefile.am,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -p -d -r1.22.2.2 -r1.22.2.3
--- Makefile.am	3 May 2006 19:59:58 -0000	1.22.2.2
+++ Makefile.am	4 May 2006 00:40:27 -0000	1.22.2.3
@@ -22,11 +22,16 @@ dist-rpm: 
 	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"	tor.spec; \
-	mv $$RPM_BUILD_DIR/SRPMS/* .;                           \
-	mv $$RPM_BUILD_DIR/RPMS/* .;				\
-	rm -rf $$RPM_BUILD_DIR
+        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
+
 
 dist-osx:
 	@if [ "x$(prefix)" != 'x/Library/Tor' ]; then \