[or-cvs] Remove a dependency on dist and assume a tarball is in ".."...

[phobos at seul.org]

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

Modified Files:
	Makefile.am 
Log Message:
Remove a dependency on dist and assume a tarball is in ".." for
dist-rpm.


Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- Makefile.am	16 Feb 2006 22:00:46 -0000	1.22
+++ Makefile.am	10 Apr 2006 14:12:29 -0000	1.23
@@ -15,14 +15,15 @@ EXTRA_DIST = INSTALL README AUTHORS LICE
 #install-data-local:
 #	$(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor
 
-dist-rpm: dist
+# Assume a tarball is in .. for now.
+dist-rpm: 
 	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;       \
+	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/* .;				\