Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(6)

Delta Between Two Patch Sets: Makefile.pre.in

Issue 25696: "make install" fails because bininstall target requires the libainstall target
Left Patch Set: Created 4 years, 4 months ago
Right Patch Set: Created 4 years, 4 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # Top-level Makefile for Python 1 # Top-level Makefile for Python
2 # 2 #
3 # As distributed, this file is called Makefile.pre.in; it is processed 3 # As distributed, this file is called Makefile.pre.in; it is processed
4 # into the real Makefile by running the script ./configure, which 4 # into the real Makefile by running the script ./configure, which
5 # replaces things like @spam@ with values appropriate for your system. 5 # replaces things like @spam@ with values appropriate for your system.
6 # This means that if you edit Makefile, your changes get lost the next 6 # This means that if you edit Makefile, your changes get lost the next
7 # time you run the configure script. Ideally, you can do: 7 # time you run the configure script. Ideally, you can do:
8 # 8 #
9 # ./configure 9 # ./configure
10 # make 10 # make
(...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 fi; \ 1102 fi; \
1103 else true; \ 1103 else true; \
1104 fi 1104 fi
1105 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ 1105 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
1106 rm -f $(DESTDIR)$(BINDIR)python$(VERSION)-32$(EXE); \ 1106 rm -f $(DESTDIR)$(BINDIR)python$(VERSION)-32$(EXE); \
1107 lipo $(LIPO_32BIT_FLAGS) \ 1107 lipo $(LIPO_32BIT_FLAGS) \
1108 -output $(DESTDIR)$(BINDIR)/python$(VERSION)-32$(EXE) \ 1108 -output $(DESTDIR)$(BINDIR)/python$(VERSION)-32$(EXE) \
1109 $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \ 1109 $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \
1110 fi 1110 fi
1111 1111
1112 bininstall: altbininstall 1112 bininstall: altbininstall $(DESTDIR)$(LIBPC)
1113 » -if test ! -d $(DESTDIR)$(LIBPC); then \
1114 » » echo "Creating directory $(LIBPC)"; \
1115 » » $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \
1116 » fi
1117 -if test -f $(DESTDIR)$(BINDIR)/python3$(EXE) -o -h $(DESTDIR)$(BINDIR)/ python3$(EXE); \ 1113 -if test -f $(DESTDIR)$(BINDIR)/python3$(EXE) -o -h $(DESTDIR)$(BINDIR)/ python3$(EXE); \
1118 then rm -f $(DESTDIR)$(BINDIR)/python3$(EXE); \ 1114 then rm -f $(DESTDIR)$(BINDIR)/python3$(EXE); \
1119 else true; \ 1115 else true; \
1120 fi 1116 fi
1121 (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE)) 1117 (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
1122 -if test "$(VERSION)" != "$(LDVERSION)"; then \ 1118 -if test "$(VERSION)" != "$(LDVERSION)"; then \
1123 rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ 1119 rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
1124 (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config pyth on$(VERSION)-config); \ 1120 (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config pyth on$(VERSION)-config); \
1125 rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ 1121 rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
1126 (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(L DVERSION).pc); \ 1122 (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(L DVERSION).pc); \
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 done 1357 done
1362 $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h 1358 $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
1363 1359
1364 # Install the library and miscellaneous stuff needed for extending/embedding 1360 # Install the library and miscellaneous stuff needed for extending/embedding
1365 # This goes into $(exec_prefix) 1361 # This goes into $(exec_prefix)
1366 LIBPL= @LIBPL@ 1362 LIBPL= @LIBPL@
1367 1363
1368 # pkgconfig directory 1364 # pkgconfig directory
1369 LIBPC= $(LIBDIR)/pkgconfig 1365 LIBPC= $(LIBDIR)/pkgconfig
1370 1366
1371 libainstall:» all python-config 1367 $(DESTDIR)$(LIBPC):
1372 » @for i in $(LIBDIR) $(LIBPL) $(LIBPC); \ 1368 » @echo "Creating directory $(LIBPC)"
1369 » @$(INSTALL) -d -m $(DIRMODE) $@
1370
1371 libainstall:» all python-config $(DESTDIR)$(LIBPC)
1372 » @for i in $(LIBDIR) $(LIBPL); \
1373 do \ 1373 do \
1374 if test ! -d $(DESTDIR)$$i; then \ 1374 if test ! -d $(DESTDIR)$$i; then \
1375 echo "Creating directory $$i"; \ 1375 echo "Creating directory $$i"; \
1376 $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \ 1376 $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
1377 else true; \ 1377 else true; \
1378 fi; \ 1378 fi; \
1379 done 1379 done
1380 @if test -d $(LIBRARY); then :; else \ 1380 @if test -d $(LIBRARY); then :; else \
1381 if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ 1381 if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
1382 if test "$(SHLIB_SUFFIX)" = .dll; then \ 1382 if test "$(SHLIB_SUFFIX)" = .dll; then \
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1674 .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure 1674 .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
1675 .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools 1675 .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
1676 .PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean 1676 .PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean
1677 .PHONY: smelly funny patchcheck touch altmaninstall commoninstall 1677 .PHONY: smelly funny patchcheck touch altmaninstall commoninstall
1678 .PHONY: gdbhooks 1678 .PHONY: gdbhooks
1679 1679
1680 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY 1680 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
1681 # Local Variables: 1681 # Local Variables:
1682 # mode: makefile 1682 # mode: makefile
1683 # End: 1683 # End:
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

RSS Feeds Recent Issues | This issue
This is Rietveld 894c83f36cb7+