From 4b6275c0617628c306c42b98b9c7f2107bf64d48 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 28 Sep 2022 10:27:50 +0200 Subject: use portable #! Also default to python3 at this time. Reported-by: Robert Smallshire --- Makefile | 11 ++++++++--- tcvt.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 562f459..225c0db 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +PYTHON ?= python3 +HASHBANG ?= /usr/bin/env $(PYTHON) PREFIX ?= /usr/local BINDIR ?= ${PREFIX}/bin MANDIR ?= ${PREFIX}/share/man @@ -5,17 +7,20 @@ MANDIR ?= ${PREFIX}/share/man install:build install -d "${DESTDIR}${BINDIR}" install -d "${DESTDIR}${MANDIR}/man1" - install -m755 tcvt.py "${DESTDIR}${BINDIR}/tcvt" + install -m755 tcvt.py.transformed "${DESTDIR}${BINDIR}/tcvt" install -m755 optcvt.sh.transformed "${DESTDIR}${BINDIR}/optcvt" install -m644 tcvt.1.gz "${DESTDIR}${MANDIR}/man1/tcvt.1.gz" ln -sf tcvt.1.gz "${DESTDIR}${MANDIR}/man1/optcvt.1.gz" -build:optcvt.sh.transformed tcvt.1.gz +build:optcvt.sh.transformed tcvt.1.gz tcvt.py.transformed clean: - rm -f optcvt.sh.transformed tcvt.1.gz + rm -f optcvt.sh.transformed tcvt.py.transformed tcvt.1.gz test.tcvterror test.result optcvt.sh.transformed:optcvt.sh sed 's!^TCVT=.*!TCVT="${BINDIR}/tcvt"!' < $< > $@ +tcvt.py.transformed:tcvt.py + sed '1c\#!$(HASHBANG)' < $< > $@ + %.gz:% gzip -9 < $< > $@ diff --git a/tcvt.py b/tcvt.py index 75ad9f3..f180eb1 100755 --- a/tcvt.py +++ b/tcvt.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 # # Tow Column Virtual Terminal. # -- cgit v1.2.3