commit 0742b387253f25c74ad2084a232b7f7fd68db1be Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 27 09:53:46 2018 -0400

Revert "Use the "commands" argument of AC_CONFIG_FILES to make scripts +x"

This reverts commit 56c1fbf33f34e010ec33e7660fab3ec3ecb43fc8. --- changes/ticket26439 | 3 --- configure.ac | 7 ------- src/test/include.am | 1 + 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/changes/ticket26439 b/changes/ticket26439 deleted file mode 100644 index b813fe43e..000000000 --- a/changes/ticket26439 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (build): - - When generating scripts from autoconf, also make them executable. - Closes ticket 26439. diff --git a/configure.ac b/configure.ac index 6d112b8c2..116a51f7a 100644 --- a/configure.ac +++ b/configure.ac @@ -2279,13 +2279,6 @@ AC_CONFIG_FILES([ src/rust/.cargo/config scripts/maint/checkOptionDocs.pl scripts/maint/updateVersions.pl -], [ - chmod +x contrib/dist/suse/tor.sh - chmod +x link_rust.sh - chmod +x contrib/dist/tor.sh - chmod +x contrib/dist/torctl - chmod +x scripts/maint/checkOptionDocs.pl - chmod +x scripts/maint/updateVersions.pl ])

if test "x$asciidoc" = "xtrue" && test "$ASCIIDOC" = "none"; then diff --git a/src/test/include.am b/src/test/include.am index 1080184ac..7e5ad4611 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -12,6 +12,7 @@ TESTS_ENVIRONMENT = \ export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \ export CARGO_ONLINE="$(CARGO_ONLINE)"; \ export CCLD="$(CCLD)"; \ + chmod +x "$(abs_top_builddir)/link_rust.sh"; \ export RUSTFLAGS="-C linker=$(abs_top_builddir)/link_rust.sh";

TESTSCRIPTS = \