1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
From: Stuart Prescott <stuart@debian.org>
Date: Wed, 19 Feb 2020 13:36:39 +1100
Subject: abstracted-python
---
Makefile.skel | 9 +++++----
doc/Makefile | 6 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Makefile.skel b/Makefile.skel
index 4e3a46b..b96d3a6 100644
--- a/Makefile.skel
+++ b/Makefile.skel
@@ -33,6 +33,7 @@ BINDIR_PRIVATE=${DESTDIR}${USRDIR}/lib/pyxplot
SRCDIR=${DESTDIR}${USRDIR}/share/pyxplot
DOCDIR=${DESTDIR}${USRDIR}/share/doc/pyxplot
MANDIR=${DESTDIR}${USRDIR}/share/man/man1
+PYTHON=python
CWD=$(shell pwd)
@@ -135,12 +136,12 @@ DEBUG_SWITCHES = $(COMMON_SWITCHES) -D SRCDIR=\"$(CWD)/$(LOCAL_SRCDIR)/\"
all: $(LOCAL_BINDIR)/pyxplot $(LOCAL_BINDIR)/pyxplot_watch $(LOCAL_BINDIR)/pyxplot_fitshelper $(LOCAL_BINDIR)/pyxplot_timehelper $(LOCAL_BINDIR)/debug/pyxplot $(LOCAL_BINDIR)/debug/pyxplot_watch $(LOCAL_BINDIR)/install/pyxplot $(LOCAL_BINDIR)/install/pyxplot_watch $(LOCAL_BINDIR)/install/pyxplot_fitshelper $(LOCAL_BINDIR)/install/pyxplot_timehelper $(LOCAL_OBJDIR)/pyxplot.1 $(LOCAL_OBJDIR)/pyxplot_watch.1
src/settings/epsColors.h: buildScripts/colorlistGenerate.py
- python buildScripts/colorlistGenerate.py
+ $(PYTHON) buildScripts/colorlistGenerate.py
src/settings/epsColors.c: src/settings/epsColors.h
src/parser/cmdList.h: buildScripts/parser_data.py buildScripts/parser_data.dat
- python buildScripts/parser_data.py
+ $(PYTHON) buildScripts/parser_data.py
src/parser/cmdList.c: src/parser/cmdList.h
@@ -224,11 +225,11 @@ $(LOCAL_BINDIR)/install/pyxplot_timehelper: $(LOCAL_SRCDIR)/helpers/pyxplot_time
$(LOCAL_OBJDIR)/pyxplot.1: buildScripts/manpage_pyxplot.py
mkdir -p $(LOCAL_OBJDIR)
- python buildScripts/manpage_pyxplot.py ${DOCDIR}/pyxplot.pdf > $(LOCAL_OBJDIR)/pyxplot.1
+ $(PYTHON) buildScripts/manpage_pyxplot.py ${DOCDIR}/pyxplot.pdf > $(LOCAL_OBJDIR)/pyxplot.1
$(LOCAL_OBJDIR)/pyxplot_watch.1: buildScripts/manpage_pyxplot_watch.py
mkdir -p $(LOCAL_OBJDIR)
- python buildScripts/manpage_pyxplot_watch.py ${DOCDIR}/pyxplot.pdf > $(LOCAL_OBJDIR)/pyxplot_watch.1
+ $(PYTHON) buildScripts/manpage_pyxplot_watch.py ${DOCDIR}/pyxplot.pdf > $(LOCAL_OBJDIR)/pyxplot_watch.1
#
diff --git a/doc/Makefile b/doc/Makefile
index 880d113..1bed0a4 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -39,15 +39,15 @@ clean:
rm -f *.pdf *.ps *.dvi *.aux *.idx *.ilg *.ind *.lob *.loe *.lof *.log *.out *.toc
$(EX_EPSDIR)/timestamp: $(FIGFILES) $(PYXPLOT) .pyxplotrc
- python makeFigureEps.py $(PYXPLOT)
+ $(PYTHON) makeFigureEps.py $(PYXPLOT)
date > $(EX_EPSDIR)/timestamp
$(EX_TEXDIR)/timestamp: $(FIGFILES) $(PYXPLOT) .pyxplotrc
- python makeFigureTex.py
+ $(PYTHON) makeFigureTex.py
date > $(EX_TEXDIR)/timestamp
$(EX_FRAGDIR)/timestamp: $(FRAGFILES) $(PYXPLOT) .pyxplotrc
- python makeFragmentTex.py
+ $(PYTHON) makeFragmentTex.py
date > $(EX_FRAGDIR)/timestamp
pyxplot-plain.pdf: pyxplot-plain.ps
|
