aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-26 17:02:06 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-26 17:02:06 -0400
commit5f41bc91c6817649ebcfbecd184640aad7a5c8f1 (patch)
treeee1d55bead1e984e88652c64757cc30f2c4d56f0
parentebbb0348dc3ad57f6be8208a90f3c2fd9fe2cbf7 (diff)
parent56c1fbf33f34e010ec33e7660fab3ec3ecb43fc8 (diff)
downloadtor-5f41bc91c6817649ebcfbecd184640aad7a5c8f1.tar.gz
tor-5f41bc91c6817649ebcfbecd184640aad7a5c8f1.zip
Merge branch 'ticket26439'
-rw-r--r--changes/ticket264393
-rw-r--r--configure.ac7
-rw-r--r--src/test/include.am1
3 files changed, 10 insertions, 1 deletions
diff --git a/changes/ticket26439 b/changes/ticket26439
new file mode 100644
index 0000000000..b813fe43ec
--- /dev/null
+++ b/changes/ticket26439
@@ -0,0 +1,3 @@
+ 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 116a51f7a3..6d112b8c2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2279,6 +2279,13 @@ 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 7e5ad46117..1080184ac4 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -12,7 +12,6 @@ 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 = \