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.
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2933c65..ef1a2d3 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -559,11 +559,11 @@
done
$(INSTALL_PROGRAM) $(BUILDPYTHON) $(BINDIR)/python$(VERSION)$(EXE)
if test -f libpython$(VERSION)$(SO); then \
- $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(LIBDIR)/$(INSTSONAME); \
- else true; \
- fi
- if test -f "$(DLLLIBRARY)"; then \
- $(INSTALL_SHARED) $(DLLLIBRARY) $(BINDIR); \
+ if test "$(SO)" = .dll; then \
+ $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(BINDIR); \
+ else \
+ $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(LIBDIR)/$(INSTSONAME); \
+ fi; \
else true; \
fi
@@ -690,8 +690,12 @@
done
@if test -d $(LIBRARY); then :; else \
if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
- $(INSTALL_DATA) $(LIBRARY) $(LIBPL)/$(LIBRARY) ; \
- $(RANLIB) $(LIBPL)/$(LIBRARY) ; \
+ if test "$(SO)" = .dll; then \
+ $(INSTALL_DATA) $(LDLIBRARY) $(LIBPL) ; \
+ else \
+ $(INSTALL_DATA) $(LIBRARY) $(LIBPL)/$(LIBRARY) ; \
+ $(RANLIB) $(LIBPL)/$(LIBRARY) ; \
+ fi; \
else \
echo Skip install of $(LIBRARY) - use make frameworkinstall; \
fi; \