[tor-commits] [tor/master] Makefile: Fix "make autostyle" for out-of-tree builds

teor at torproject.org teor at torproject.org
Tue Nov 5 04:28:52 UTC 2019


commit 9e2a2d38f45c45e455df04c20147bca5ebf078ce
Author: teor <teor at torproject.org>
Date:   Tue Nov 5 11:56:14 2019 +1000

    Makefile: Fix "make autostyle" for out-of-tree builds
    
    Fixes bug 32370; bugfix on 0.4.1.2-alpha.
---
 Makefile.am      | 8 ++++----
 changes/bug32370 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9866f87f8..8b2772577 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -488,19 +488,19 @@ version:
 
 .PHONY: autostyle-ifdefs
 autostyle-ifdefs:
-	$(PYTHON) scripts/maint/annotate_ifdef_directives.py $(OWNED_TOR_C_FILES)
+	$(PYTHON) $(top_srcdir)/scripts/maint/annotate_ifdef_directives.py $(OWNED_TOR_C_FILES)
 
 .PHONY: autostyle-ifdefs
 autostyle-operators:
-	$(PERL) scripts/coccinelle/test-operator-cleanup $(OWNED_TOR_C_FILES)
+	$(PERL) $(top_srcdir)/scripts/coccinelle/test-operator-cleanup $(OWNED_TOR_C_FILES)
 
 .PHONY: rectify-includes
 rectify-includes:
-	$(PYTHON) scripts/maint/rectify_include_paths.py
+	$(PYTHON) $(top_srcdir)/scripts/maint/rectify_include_paths.py
 
 .PHONY: update-copyright
 update-copyright:
-	$(PERL) scripts/maint/updateCopyright.pl $(OWNED_TOR_C_FILES)
+	$(PERL) $(top_srcdir)/scripts/maint/updateCopyright.pl $(OWNED_TOR_C_FILES)
 
 .PHONY: autostyle
 autostyle: update-versions rustfmt autostyle-ifdefs rectify-includes
diff --git a/changes/bug32370 b/changes/bug32370
new file mode 100644
index 000000000..9e450d961
--- /dev/null
+++ b/changes/bug32370
@@ -0,0 +1,3 @@
+  o Minor bugfixes (build):
+    - Fix "make autostyle" for out-of-tree builds.
+      Fixes bug 32370; bugfix on 0.4.1.2-alpha.





More information about the tor-commits mailing list