FFFF Update framework installation makefiles to deal correctly with the · python/cpython@38e2d8e · GitHub
[go: up one dir, main page]
Skip to content

Commit 38e2d8e

Browse files
ronaldoussorenronaldoussoren
committed
Update framework installation makefiles to deal correctly with the
rename of 'python' to 'python3'
1 parent 578cc74 commit 38e2d8e

File tree

1 file changed

+19
-23
lines changed

1 file changed

+19
-23
lines changed

‎Mac/Makefile.in‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ installapps4way: install_Python4way install_PythonLauncher \
5656
install_pythonw: pythonw
5757
$(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)"
5858
$(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/python$(VERSION)"
59-
ln -sf python$(VERSION) "$(DESTDIR)$(prefix)/bin/python"
60-
ln -sf pythonw$(VERSION) "$(DESTDIR)$(prefix)/bin/pythonw"
59+
ln -sf python$(VERSION) "$(DESTDIR)$(prefix)/bin/python3"
60+
ln -sf pythonw$(VERSION) "$(DESTDIR)$(prefix)/bin/pythonw3"
6161

6262

6363
# Install 3 variants of python/pythonw:
@@ -68,23 +68,23 @@ install_pythonw: pythonw
6868
install_pythonw4way: pythonw-32 pythonw-64 pythonw
6969 10BC0
$(INSTALL_PROGRAM) $(STRIPFLAG) pythonw-64 "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)-64"
7070
$(INSTALL_PROGRAM) $(STRIPFLAG) pythonw-64 "$(DESTDIR)$(prefix)/bin/python$(VERSION)-64"
71-
ln -sf python$(VERSION)-64 "$(DESTDIR)$(prefix)/bin/python-64"
72-
ln -sf pythonw$(VERSION)-64 "$(DESTDIR)$(prefix)/bin/pythonw-64"
71+
ln -sf python$(VERSION)-64 "$(DESTDIR)$(prefix)/bin/python3-64"
72+
ln -sf pythonw$(VERSION)-64 "$(DESTDIR)$(prefix)/bin/pythonw3-64"
7373

7474
$(INSTALL_PROGRAM) $(STRIPFLAG) pythonw-32 "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)-32"
7575
$(INSTALL_PROGRAM) $(STRIPFLAG) pythonw-32 "$(DESTDIR)$(prefix)/bin/python$(VERSION)-32"
76-
ln -sf python$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/python-32"
77-
ln -sf pythonw$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/pythonw-32"
76+
ln -sf python$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/python3-32"
77+
ln -sf pythonw$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/pythonw3-32"
7878

7979
$(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)-all"
8080
$(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/python$(VERSION)-all"
81-
ln -sf python$(VERSION)-all "$(DESTDIR)$(prefix)/bin/python-all"
82-
ln -sf pythonw$(VERSION)-all "$(DESTDIR)$(prefix)/bin/pythonw-all"
81+
ln -sf python$(VERSION)-all "$(DESTDIR)$(prefix)/bin/python3-all"
82+
ln -sf pythonw$(VERSION)-all "$(DESTDIR)$(prefix)/bin/pythonw3-all"
8383

8484
ln -sf pythonw$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)"
8585
ln -sf python$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/python$(VERSION)"
86-
ln -sf pythonw$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/pythonw"
87-
ln -sf python$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/python"
86+
ln -sf pythonw$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/pythonw3"
87+
ln -sf python$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/python3"
8888

8989
#
9090
# Install unix tools in /usr/local/bin. These are just aliases for the
@@ -94,9 +94,9 @@ installunixtools:
9494
if [ ! -d "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ]; then \
9595
$(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
9696
fi
97-
for fn in python pythonw idle pydoc python-config smtpd.py \
97+
for fn in python3 pythonw3 idle3 pydoc3 python3-config \
9898
python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
99-
pydoc$(VERSION) python$(VERSION)-config smtpd$(VERSION).py ;\
99+
pydoc$(VERSION) python$(VERSION)-config ;\
100100
do \
101101
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
102102
done
@@ -114,7 +114,7 @@ altinstallunixtools:
114114
$(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
115115
fi
116116
for fn in python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
117-
pydoc$(VERSION) python$(VERSION)-config smtpd$(VERSION).py ;\
117+
pydoc$(VERSION) python$(VERSION)-config ;\
118118
do \
119119
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
120120
done
@@ -129,19 +129,15 @@ altinstallunixtools4way: altinstallunixtools
129129
install_versionedtools:
130130
for fn in idle pydoc ;\
131131
do \
132-
if [ -h "$(DESTDIR)$(prefix)/bin/$${fn}" ]; then \
132+
if [ -h "$(DESTDIR)$(prefix)/bin/$${fn}3" ]; then \
133133
continue ;\
134134
fi ;\
135-
mv "$(DESTDIR)$(prefix)/bin/$${fn}" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)" ;\
136-
ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}" ;\
135+
mv "$(DESTDIR)$(prefix)/bin/$${fn}3" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)" ;\
136+
ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}3" ;\
137137
done
138-
if [ ! -h "$(DESTDIR)$(prefix)/bin/python-config" ]; then \
139-
mv "$(DESTDIR)$(prefix)/bin/python-config" "$(DESTDIR)$(prefix)/bin/python$(VERSION)-config" ;\
140-
ln -sf "python$(VERSION)-config" "$(DESTDIR)$(prefix)/bin/python-config" ; \
141-
fi
142-
if [ ! -h "$(DESTDIR)$(prefix)/bin/smtpd.py" ]; then \
143-
mv "$(DESTDIR)$(prefix)/bin/smtpd.py" "$(DESTDIR)$(prefix)/bin/smtpd$(VERSION).py" ;\
144-
ln -sf "smtpd$(VERSION).py" "$(DESTDIR)$(prefix)/bin/smtpd.py" ;\
138+
if [ ! -h "$(DESTDIR)$(prefix)/bin/python3-config" ]; then \
139+
mv "$(DESTDIR)$(prefix)/bin/python3-config" "$(DESTDIR)$(prefix)/bin/python$(VERSION)-config" ;\
140+
ln -sf "python$(VERSION)-config" "$(DESTDIR)$(prefix)/bin/python3-config" ; \
145141
fi
146142

147143

0 commit comments

Comments
 (0)
0