[or-cvs] Backport SUSE rpm changes.

[phobos at seul.org]

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

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


Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/Makefile.am,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -p -d -r1.19.2.1 -r1.19.2.2
--- Makefile.am	5 May 2006 17:02:12 -0000	1.19.2.1
+++ Makefile.am	10 Jun 2006 01:01:12 -0000	1.19.2.2
@@ -1,9 +1,9 @@
-SUBDIRS = osx
-DIST_SUBDIRS = osx
+SUBDIRS = osx suse
+DIST_SUBDIRS = osx suse
 
 confdir = $(sysconfdir)/tor
 
-EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py
+EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh
 
 conf_DATA = tor-tsocks.conf