diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-28 11:59:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-28 11:59:55 -0400 |
| commit | 703ad69587b512088f178da52494d7767f521c38 (patch) | |
| tree | b4209f96d7494bdf2dbb9af74549ed83d291579e /contrib | |
| parent | 9230bc7c65cec68c66fa9c75751d6c6bd600e9fc (diff) | |
| download | tor-703ad69587b512088f178da52494d7767f521c38.tar tor-703ad69587b512088f178da52494d7767f521c38.tar.gz | |
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')
| -rw-r--r-- | contrib/dist/suse/include.am | 1 | ||||
| -rw-r--r-- | contrib/include.am | 28 | ||||
| -rw-r--r-- | contrib/win32build/package_nsis-mingw.sh | 6 |
3 files changed, 16 insertions, 19 deletions
diff --git a/contrib/dist/suse/include.am b/contrib/dist/suse/include.am deleted file mode 100644 index 4aed0e123..000000000 --- a/contrib/dist/suse/include.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST+= contrib/suse/tor.sh diff --git a/contrib/include.am b/contrib/include.am index 62b76ebeb..012079861 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 diff --git a/contrib/win32build/package_nsis-mingw.sh b/contrib/win32build/package_nsis-mingw.sh index b8a46cdbe..cae862b91 100644 --- a/contrib/win32build/package_nsis-mingw.sh +++ b/contrib/win32build/package_nsis-mingw.sh @@ -40,7 +40,7 @@ # you know what you are doing. # Start in the tor source directory after you've compiled tor.exe -# This means start as ./contrib/package_nsis-mingw.sh +# This means start as ./contrib/win32build/package_nsis-mingw.sh rm -rf win_tmp mkdir win_tmp @@ -56,7 +56,7 @@ mkdir win_tmp/tmp cp src/or/tor.exe win_tmp/bin/ cp src/tools/tor-resolve.exe win_tmp/bin/ -cp contrib/tor.ico win_tmp/bin/ +cp contrib/win32build/tor.ico win_tmp/bin/ cp src/config/geoip win_tmp/bin/ strip win_tmp/bin/*.exe @@ -88,7 +88,7 @@ done clean_localstatedir src/config/torrc.sample.in win_tmp/src/config/torrc.sample -cp contrib/tor-mingw.nsi.in win_tmp/contrib/ +cp contrib/win32build/tor-mingw.nsi.in win_tmp/contrib/ cd win_tmp makensis.exe contrib/tor-mingw.nsi.in |