[tor-commits] [tor/master] Use the "commands" argument of AC_CONFIG_FILES to make scripts +x

nickm at torproject.org nickm at torproject.org
Tue Jun 26 21:02:14 UTC 2018


commit 56c1fbf33f34e010ec33e7660fab3ec3ecb43fc8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 21 09:14:19 2018 -0400

    Use the "commands" argument of AC_CONFIG_FILES to make scripts +x
    
    Closes ticket 26439.
---
 changes/ticket26439 | 3 +++
 configure.ac        | 7 +++++++
 src/test/include.am | 1 -
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/changes/ticket26439 b/changes/ticket26439
new file mode 100644
index 000000000..b813fe43e
--- /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 30f8e63ec..14a1a9436 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2275,6 +2275,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 7e5ad4611..1080184ac 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 = \





More information about the tor-commits mailing list