| From a0e6f0ec9dc6dd1db1c03f7f273cc16cb3af5561 Mon Sep 17 00:00:00 2001 |
| From: Ross Burton <ross.burton@intel.com> |
| Date: Thu, 11 Jul 2019 17:47:11 +0100 |
| Subject: [PATCH] Makefile.am: use PYTHON when invoking psl-make-dafsa |
| |
| In an environment where only Python 3 is installed, configure.ac finds and sets |
| PYTHON=python3 correctly but src/psl-make-dafsa is called directly, so the hashbang of |
| `#!/usr/bin/env python` is used which doesn't exist. |
| |
| Fix this by explicitly running $(PYTHON) when using the tool. |
| |
| Upstream-Status: Backport [https://github.com/rockdaboot/libpsl/commit/b4fec5d0ddb70fc4f5360eb14f2f5c5e91194333] |
| Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| --- |
| src/Makefile.am | 2 +- |
| tests/Makefile.am | 4 ++-- |
| 2 files changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/src/Makefile.am b/src/Makefile.am |
| index f9c0a3d..a05ea05 100644 |
| --- a/src/Makefile.am |
| +++ b/src/Makefile.am |
| @@ -19,7 +19,7 @@ libpsl_la_LDFLAGS = -no-undefined -version-info $(LIBPSL_SO_VERSION) |
| # Build rule for suffix_dafsa.c |
| # PSL_FILE can be set by ./configure --with-psl-file=[PATH] |
| suffixes_dafsa.h: $(PSL_FILE) $(srcdir)/psl-make-dafsa |
| - $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h |
| + $(PYTHON) $(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h |
| |
| EXTRA_DIST = psl-make-dafsa LICENSE.chromium |
| |
| diff --git a/tests/Makefile.am b/tests/Makefile.am |
| index 8b29b61..28a9a0b 100644 |
| --- a/tests/Makefile.am |
| +++ b/tests/Makefile.am |
| @@ -34,9 +34,9 @@ TESTS = $(PSL_TESTS) |
| # check-local target works in parallel to the tests, so the test suite will likely fail |
| BUILT_SOURCES = psl.dafsa psl_ascii.dafsa |
| psl.dafsa: $(top_srcdir)/list/public_suffix_list.dat |
| - $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa |
| + $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa |
| psl_ascii.dafsa: $(top_srcdir)/list/public_suffix_list.dat |
| - $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa |
| + $(PYTHON) $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa |
| |
| clean-local: |
| rm -f psl.dafsa psl_ascii.dafsa |
| -- |
| 2.17.1 |
| |