summaryrefslogtreecommitdiff
path: root/contrib/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-28 11:59:55 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-28 11:59:55 -0400
commit703ad69587b512088f178da52494d7767f521c38 (patch)
treeb4209f96d7494bdf2dbb9af74549ed83d291579e /contrib/include.am
parent9230bc7c65cec68c66fa9c75751d6c6bd600e9fc (diff)
downloadtor-703ad69587b512088f178da52494d7767f521c38.tar.gz
tor-703ad69587b512088f178da52494d7767f521c38.zip
Deal with the aftermath of sorting contrib
This basically amounts to grepping for every file that mentioned contrib and adjusting its references to refer to the right place.
Diffstat (limited to 'contrib/include.am')
-rw-r--r--contrib/include.am28
1 files changed, 13 insertions, 15 deletions
diff --git a/contrib/include.am b/contrib/include.am
index 62b76ebeb9..0120798614 100644
--- a/contrib/include.am
+++ b/contrib/include.am
@@ -1,18 +1,16 @@
-include contrib/suse/include.am
EXTRA_DIST+= \
- contrib/cross.sh \
- contrib/exitlist \
- contrib/linux-tor-prio.sh \
- contrib/package_nsis-mingw.sh \
- contrib/rc.subr \
- contrib/tor-ctrl.sh \
- contrib/tor-exit-notice.html \
- contrib/tor-mingw.nsi.in \
- contrib/tor.ico \
- contrib/tor.nsi.in \
- contrib/tor.sh \
- contrib/torify \
- contrib/torctl
+ contrib/client-tools/torify \
+ contrib/dist/rc.subr \
+ contrib/dist/suse/tor.sh.in \
+ contrib/dist/tor.sh \
+ contrib/dist/torctl \
+ contrib/operator-tools/linux-tor-prio.sh \
+ contrib/operator-tools/tor-exit-notice.html \
+ contrib/or-tools/exitlist \
+ contrib/win32build/package_nsis-mingw.sh \
+ contrib/win32build/tor-mingw.nsi.in \
+ contrib/win32build/tor.ico \
+ contrib/win32build/tor.nsi.in
-bin_SCRIPTS+= contrib/torify
+bin_SCRIPTS+= contrib/client-tools/torify