Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Patch #553702: Cygwin make install patch 

This patch fixes make install for Cygwin. Specifically,
it reverts to the previous behavior:

o install libpython$(VERSION)$(SO) in $(BINDIR)
o install $(LDLIBRARY) in $(LIBPL)

It also begins to remove Cygwin's dependency on
$(DLLLIBRARY) which I hope to take advantage of
when I attempt to make Cygwin as similar as possible
to the other Unix platforms (in other patches).

I tested this patch under Red Hat Linux 7.1 without
any ill effects.

BTW, I'm not the happiest using the following
test for Cygwin:

test "$(SO)" = .dll

I'm willing to update the patch to use:

case "$(MACHDEP)" in cygwin*

instead, but IMO that will look uglier.
This commit is contained in:
Jason Tishler 2002-07-29 16:18:23 +00:00
parent 56796f672f
commit c0f1e7749c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.pre.in
View File

@ -559,11 +559,11 @@ altbininstall: $(BUILDPYTHON)
done done
$(INSTALL_PROGRAM) $(BUILDPYTHON) $(BINDIR)/python$(VERSION)$(EXE) $(INSTALL_PROGRAM) $(BUILDPYTHON) $(BINDIR)/python$(VERSION)$(EXE)
if test -f libpython$(VERSION)$(SO); then \ if test -f libpython$(VERSION)$(SO); then \
$(INSTALL_SHARED) libpython$(VERSION)$(SO) $(LIBDIR)/$(INSTSONAME); \ if test "$(SO)" = .dll; then \
else true; \ $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(BINDIR); \
fi else \
if test -f "$(DLLLIBRARY)"; then \ $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(LIBDIR)/$(INSTSONAME); \
$(INSTALL_SHARED) $(DLLLIBRARY) $(BINDIR); \ fi; \
else true; \ else true; \
fi fi
@ -690,8 +690,12 @@ libainstall: all
done done
@if test -d $(LIBRARY); then :; else \ @if test -d $(LIBRARY); then :; else \
if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
$(INSTALL_DATA) $(LIBRARY) $(LIBPL)/$(LIBRARY) ; \ if test "$(SO)" = .dll; then \
$(RANLIB) $(LIBPL)/$(LIBRARY) ; \ $(INSTALL_DATA) $(LDLIBRARY) $(LIBPL) ; \
else \
$(INSTALL_DATA) $(LIBRARY) $(LIBPL)/$(LIBRARY) ; \
$(RANLIB) $(LIBPL)/$(LIBRARY) ; \
fi; \
else \ else \
echo Skip install of $(LIBRARY) - use make frameworkinstall; \ echo Skip install of $(LIBRARY) - use make frameworkinstall; \
fi; \ fi; \