@@ -59,7 +59,7 @@ DSYMUTIL_PATH= @DSYMUTIL_PATH@
59
59
GNULD= @GNULD@
60
60
61
61
# Shell used by make (some versions default to the login shell, which is bad)
62
- SHELL= /bin/sh
62
+ SHELL= /bin/sh -e
63
63
64
64
# Use this to make a link between python$(VERSION) and python in $(BINDIR)
65
65
LN= @LN@
@@ -738,7 +738,6 @@ $(LIBRARY): $(LIBRARY_OBJS)
738
738
$(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
739
739
740
740
libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
741
- set -e; \
742
741
if test $(INSTSONAME) != $(LDLIBRARY); then \
743
742
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
744
743
$(LN) -f $(INSTSONAME) $@; \
@@ -895,8 +894,7 @@ $(LIBEXPAT_A): $(LIBEXPAT_OBJS)
895
894
# pybuilddir.txt is created too late. We cannot use it in Makefile
896
895
# targets. ln --relative is not portable.
897
896
sharedmods: $(SHAREDMODS) pybuilddir.txt
898
- @set -e; \
899
- target=`cat pybuilddir.txt`; \
897
+ @target=`cat pybuilddir.txt`; \
900
898
$(MKDIR_P) $$target; \
901
899
for mod in X $(SHAREDMODS); do \
902
900
if test $$mod != X; then \
@@ -909,8 +907,7 @@ checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON)
909
907
@$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py
910
908
911
909
rundsymutil: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON)
912
- @set -e; \
913
- if [ ! -z $(DSYMUTIL) ] ; then \
910
+ @if [ ! -z $(DSYMUTIL) ] ; then \
914
911
echo $(DSYMUTIL_PATH) $(BUILDPYTHON); \
915
912
$(DSYMUTIL_PATH) $(BUILDPYTHON); \
916
913
if test -f $(LDLIBRARY); then \
@@ -1817,17 +1814,15 @@ commoninstall: check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
1817
1814
DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
1818
1815
1819
1816
sharedinstall: all
1820
- @set -e; \
1821
- for i in $(DESTDIRS); \
1817
+ @for i in $(DESTDIRS); \
1822
1818
do \
1823
1819
if test ! -d $(DESTDIR)$$i; then \
1824
1820
echo "Creating directory $$i"; \
1825
1821
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
1826
1822
else true; \
1827
1823
fi; \
1828
1824
done
1829
- @set -e; \
1830
- for i in X $(SHAREDMODS); do \
1825
+ @for i in X $(SHAREDMODS); do \
1831
1826
if test $$i != X; then \
1832
1827
echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
1833
1828
$(INSTALL_SHARED) $$i $(DESTDIR)$(DESTSHARED)/`basename $$i`; \
@@ -1841,8 +1836,7 @@ sharedinstall: all
1841
1836
# Install the interpreter with $(VERSION) affixed
1842
1837
# This goes into $(exec_prefix)
1843
1838
altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@
1844
- @set -e; \
1845
- for i in $(BINDIR) $(LIBDIR); \
1839
+ @for i in $(BINDIR) $(LIBDIR); \
1846
1840
do \
1847
1841
if test ! -d $(DESTDIR)$$i; then \
1848
1842
echo "Creating directory $$i"; \
@@ -1861,8 +1855,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@
1861
1855
fi; \
1862
1856
(cd $(DESTDIR)$(BINDIR); $(LN) python$(LDVERSION)$(EXE) python$(VERSION)$(EXE)); \
1863
1857
fi
1864
- @set -e; \
1865
- if test "$(PY_ENABLE_SHARED)" = 1 -o "$(STATIC_LIBPYTHON)" = 1; then \
1858
+ @if test "$(PY_ENABLE_SHARED)" = 1 -o "$(STATIC_LIBPYTHON)" = 1; then \
1866
1859
if test -f $(LDLIBRARY) && test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \
1867
1860
if test -n "$(DLLLIBRARY)" ; then \
1868
1861
$(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \
@@ -1949,8 +1942,7 @@ bininstall: altbininstall
1949
1942
1950
1943
# Install the versioned manual page
1951
1944
altmaninstall:
1952
- @set -e; \
1953
- for i in $(MANDIR) $(MANDIR)/man1; \
1945
+ @for i in $(MANDIR) $(MANDIR)/man1; \
1954
1946
do \
1955
1947
if test ! -d $(DESTDIR)$$i; then \
1956
1948
echo "Creating directory $$i"; \
@@ -2085,17 +2077,15 @@ COMPILEALL_OPTS=-j0
2085
2077
2086
2078
TEST_MODULES=@TEST_MODULES@
2087
2079
libinstall: all $(srcdir)/Modules/xxmodule.c
2088
- @set -e; \
2089
- for i in $(SCRIPTDIR) $(LIBDEST); \
2080
+ @for i in $(SCRIPTDIR) $(LIBDEST); \
2090
2081
do \
2091
2082
if test ! -d $(DESTDIR)$$i; then \
2092
2083
echo "Creating directory $$i"; \
2093
2084
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
2094
2085
else true; \
2095
2086
fi; \
2096
2087
done
2097
- @set -e; \
2098
- if test "$(TEST_MODULES)" = yes; then \
2088
+ @if test "$(TEST_MODULES)" = yes; then \
2099
2089
subdirs="$(LIBSUBDIRS) $(TESTSUBDIRS)"; \
2100
2090
else \
2101
2091
subdirs="$(LIBSUBDIRS)"; \
@@ -2111,8 +2101,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c
2111
2101
else true; \
2112
2102
fi; \
2113
2103
done
2114
- @set -e; \
2115
- for i in $(srcdir)/Lib/*.py; \
2104
+ @for i in $(srcdir)/Lib/*.py; \
2116
2105
do \
2117
2106
if test -x $$i; then \
2118
2107
$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
@@ -2122,8 +2111,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c
2122
2111
echo $(INSTALL_DATA) $$i $(LIBDEST); \
2123
2112
fi; \
2124
2113
done
2125
- @set -e; \
2126
- if test "$(TEST_MODULES)" = yes; then \
2114
+ @if test "$(TEST_MODULES)" = yes; then \
2127
2115
subdirs="$(LIBSUBDIRS) $(TESTSUBDIRS)"; \
2128
2116
else \
2129
2117
subdirs="$(LIBSUBDIRS)"; \
@@ -2213,8 +2201,7 @@ scripts: $(SCRIPT_2TO3) $(SCRIPT_IDLE) $(SCRIPT_PYDOC) python-config
2213
2201
# Install the include files
2214
2202
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
2215
2203
inclinstall:
2216
- @set -e; \
2217
- for i in $(INCLDIRSTOMAKE); \
2204
+ @for i in $(INCLDIRSTOMAKE); \
2218
2205
do \
2219
2206
if test ! -d $(DESTDIR)$$i; then \
2220
2207
echo "Creating directory $$i"; \
@@ -2232,20 +2219,17 @@ inclinstall:
2232
2219
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(INCLUDEPY)/internal; \
2233
2220
else true; \
2234
2221
fi
2235
- @set -e; \
2236
- for i in $(srcdir)/Include/*.h; \
2222
+ @for i in $(srcdir)/Include/*.h; \
2237
2223
do \
2238
2224
echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
2239
2225
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
2240
2226
done
2241
- @set -e; \
2242
- for i in $(srcdir)/Include/cpython/*.h; \
2227
+ @for i in $(srcdir)/Include/cpython/*.h; \
2243
2228
do \
2244
2229
echo $(INSTALL_DATA) $$i $(INCLUDEPY)/cpython; \
2245
2230
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY)/cpython; \
2246
2231
done
2247
- @set -e; \
2248
- for i in $(srcdir)/Include/internal/*.h; \
2232
+ @for i in $(srcdir)/Include/internal/*.h; \
2249
2233
do \
2250
2234
echo $(INSTALL_DATA) $$i $(INCLUDEPY)/internal; \
2251
2235
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY)/internal; \
@@ -2260,17 +2244,15 @@ LIBPL= @LIBPL@
2260
2244
LIBPC= $(LIBDIR)/pkgconfig
2261
2245
2262
2246
libainstall: all scripts
2263
- @set -e; \
2264
- for i in $(LIBDIR) $(LIBPL) $(LIBPC) $(BINDIR); \
2247
+ @for i in $(LIBDIR) $(LIBPL) $(LIBPC) $(BINDIR); \
2265
2248
do \
2266
2249
if test ! -d $(DESTDIR)$$i; then \
2267
2250
echo "Creating directory $$i"; \
2268
2251
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
2269
2252
else true; \
2270
2253
fi; \
2271
2254
done
2272
- @set -e; \
2273
- if test "$(STATIC_LIBPYTHON)" = 1; then \
2255
+ @if test "$(STATIC_LIBPYTHON)" = 1; then \
2274
2256
if test -d $(LIBRARY); then :; else \
2275
2257
if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
2276
2258
if test "$(SHLIB_SUFFIX)" = .dll; then \
@@ -2300,8 +2282,7 @@ libainstall: all scripts
2300
2282
$(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION)
2301
2283
$(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION)
2302
2284
$(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION)
2303
- @set -e; \
2304
- if [ -s Modules/python.exp -a \
2285
+ @if [ -s Modules/python.exp -a \
2305
2286
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
2306
2287
echo; echo "Installing support files for building shared extension modules on AIX:"; \
2307
2288
$(INSTALL_DATA) Modules/python.exp \
@@ -2341,8 +2322,7 @@ frameworkinstallstructure: $(LDLIBRARY)
2341
2322
exit 1; \
2342
2323
else true; \
2343
2324
fi
2344
- @set -e; \
2345
- for i in $(prefix)/Resources/English.lproj $(prefix)/lib; do\
2325
+ @for i in $(prefix)/Resources/English.lproj $(prefix)/lib; do\
2346
2326
if test ! -d $(DESTDIR)$$i; then \
2347
2327
echo "Creating directory $(DESTDIR)$$i"; \
2348
2328
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
0 commit comments