postgres.git / summary / log / commit / refs

commit    8a9e4e84e3cf75a01df5bf26fd35ffc9576b40f1
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Wed Sep 27 05:41:21 2023 +0000
First released in: 17.0, 13.13, 14.10, 15.5, 16.1

    unaccent: Tweak value of PYTHON when building without Python support
    
    As coded, the module's Makefile would fail to set a value for PYTHON as
    it checked if the variable is defined.  When compiling without
    --with-python, PYTHON is defined and set to an empty value, so the
    existing check is not able to do its work.
    
    This commit switches the rule to check if the value is empty rather than
    defined, allowing the generation of unaccent.rules even if --with-python
    is not used as long as "python" exists.  BISON and FLEX do the same in
    pgxs.mk, for instance.
    
    Thinko in f85a485f89e2.
    
    Author: Japin Li
    Discussion: https://postgr.es/m/MEYP282MB1669F86C0DC7B4DC48489CB0B6C3A@MEYP282MB1669.AUSP282.PROD.OUTLOOK.COM
    Backpatch-through: 13


 contrib/unaccent/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile
index d6c466e07ad..b837e864c50 100644
--- a/contrib/unaccent/Makefile
+++ b/contrib/unaccent/Makefile
@@ -30,7 +30,9 @@ endif
 update-unicode: $(srcdir)/unaccent.rules
 
 # Allow running this even without --with-python
-PYTHON ?= python
+ifeq ($(PYTHON),)
+PYTHON = python
+endif
 
 $(srcdir)/unaccent.rules: generate_unaccent_rules.py ../../src/common/unicode/UnicodeData.txt Latin-ASCII.xml
 	$(PYTHON) $< --unicode-data-file $(word 2,$^) --latin-ascii-file $(word 3,$^) >$@


[parent: 78f17fb97a7e]