Our program is now called 'tor', not 'or'.

svn:r92

diff --git a/configure.in b/configure.in
index c6616f9ef744313f6307d074dc2d47192f4ffb4b..ac1bcef0405e1e73a5b97e27e9a6016af9c06872 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 
 AC_INIT
-AM_INIT_AUTOMAKE(or, 0.0.0)
+AM_INIT_AUTOMAKE(tor, 0.0.0)
 AM_CONFIG_HEADER(orconfig.h)
 
 CFLAGS="-Wall -O2"

diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index 0bf5f4a787e1ac4ad48d07b44fbdb408edef769e..24408979f7aad0aa59d45d2fb5916da223bac2f1 100644 (file)
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -3,11 +3,11 @@ TESTS = test_config
 
 noinst_PROGRAMS = test_config
 
-bin_PROGRAMS = or
+bin_PROGRAMS = tor
 
-or_LDADD = -L../common -lor
+tor_LDADD = -L../common -lor
 
-or_SOURCES = buffers.c cell.c circuit.c command.c connection.c \
+tor_SOURCES = buffers.c cell.c circuit.c command.c connection.c \
              connection_exit.c connection_ap.c connection_op.c connection_or.c config.c \
              main.c onion.c routers.c