aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2006-05-26 13:42:28 +0000
committerAndrew Lewman <andrew@torproject.org>2006-05-26 13:42:28 +0000
commit0cdba91de554a13cb64420ce3bd35f079383a629 (patch)
tree38dad5df787f6ae74a07598695f41d2cb0dd0bd2
parentf9e3b5f24cb25a3ad4c91098e60b606017f37187 (diff)
downloadtor-0cdba91de554a13cb64420ce3bd35f079383a629.tar.gz
tor-0cdba91de554a13cb64420ce3bd35f079383a629.zip
Let AC_OUTPUT know about contrib/suse/tor.sh and we only need tor.sh
from contrib/suse svn:r6501
-rw-r--r--configure.in2
-rw-r--r--contrib/suse/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index aa666a73f2..ef50d62755 100644
--- a/configure.in
+++ b/configure.in
@@ -598,7 +598,7 @@ fi
echo "confdir: $CONFDIR"
-AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile)
+AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/tor.sh)
if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then
./contrib/updateVersions.pl
diff --git a/contrib/suse/Makefile.am b/contrib/suse/Makefile.am
index c9c0447a5d..06511c0425 100644
--- a/contrib/suse/Makefile.am
+++ b/contrib/suse/Makefile.am
@@ -1,3 +1,3 @@
confdir = $(sysconfdir)/tor
-EXTRA_DIST = tor.sh.in tor.sh
+EXTRA_DIST = tor.sh