diff options
| author | Collin Winter <collinw@gmail.com> | 2010-03-19 21:17:17 +0000 |
|---|---|---|
| committer | Collin Winter <collinw@gmail.com> | 2010-03-19 21:17:17 +0000 |
| commit | bf19907e06e5d8bffca0476dc62c19dc390e0aa2 (patch) | |
| tree | 29db31f5ceefbe8099a01ca6f98086a3b8c6c8c0 /Makefile.pre.in | |
| parent | 0dbc667d71573ebb9710398629cf9c8bedb3a77b (diff) | |
| download | cpython-git-bf19907e06e5d8bffca0476dc62c19dc390e0aa2.tar.gz | |
Merged revisions 79082,79084 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79082 | collin.winter | 2010-03-18 17:00:30 -0700 (Thu, 18 Mar 2010) | 1 line
Add a separate python-config make target, useful for testing changes to Misc/python-config.in.
........
r79084 | collin.winter | 2010-03-18 17:08:44 -0700 (Thu, 18 Mar 2010) | 1 line
Make python-config support multiple option flags on the same command line, rather than requiring one invocation per flag.
........
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 8eab038c40..0bfaa8fcbd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -941,6 +941,11 @@ $(srcdir)/Lib/$(PLATDIR): export EXE; EXE="$(BUILDEXE)"; \ cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen +python-config: $(srcdir)/Misc/python-config.in + # Substitution happens here, as the completely-expanded BINDIR + # is not available in configure + sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config + # Install the include files INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) inclinstall: @@ -966,7 +971,7 @@ LIBPL= $(LIBP)/config # pkgconfig directory LIBPC= $(LIBDIR)/pkgconfig -libainstall: all +libainstall: all python-config @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \ do \ if test ! -d $(DESTDIR)$$i; then \ @@ -997,9 +1002,6 @@ libainstall: all $(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh - # Substitution happens here, as the completely-expanded BINDIR - # is not available in configure - sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config rm python-config @if [ -s Modules/python.exp -a \ |