diff options
| author | Jason Tishler <jason@tishler.net> | 2002-07-29 16:18:23 +0000 |
|---|---|---|
| committer | Jason Tishler <jason@tishler.net> | 2002-07-29 16:18:23 +0000 |
| commit | c0f1e7749cba16273dfa0b0cec6c39406df9d7b6 (patch) | |
| tree | e5932e10fec84029118762a4e89ae7d114089a6a | |
| parent | 56796f672fb571d80199cf08aa059db9df55257b (diff) | |
| download | cpython-git-c0f1e7749cba16273dfa0b0cec6c39406df9d7b6.tar.gz | |
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.
| -rw-r--r-- | Makefile.pre.in | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 2933c6539c..ef1a2d38fd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -559,11 +559,11 @@ altbininstall: $(BUILDPYTHON) 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 @@ libainstall: all 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; \ |