[Python-checkins] python/dist/src Makefile.pre.in,1.88,1.89
jlt63@users.sourceforge.net
jlt63@users.sourceforge.net
Mon, 29 Jul 2002 09:18:25 -0700
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv11453
Modified Files:
Makefile.pre.in
Log Message:
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.
Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** Makefile.pre.in 19 Jul 2002 06:55:40 -0000 1.88
--- Makefile.pre.in 29 Jul 2002 16:18:23 -0000 1.89
***************
*** 560,568 ****
$(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); \
else true; \
fi
--- 560,568 ----
$(INSTALL_PROGRAM) $(BUILDPYTHON) $(BINDIR)/python$(VERSION)$(EXE)
if test -f libpython$(VERSION)$(SO); then \
! if test "$(SO)" = .dll; then \
! $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(BINDIR); \
! else \
! $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(LIBDIR)/$(INSTSONAME); \
! fi; \
else true; \
fi
***************
*** 691,696 ****
@if test -d $(LIBRARY); then :; else \
if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
! $(INSTALL_DATA) $(LIBRARY) $(LIBPL)/$(LIBRARY) ; \
! $(RANLIB) $(LIBPL)/$(LIBRARY) ; \
else \
echo Skip install of $(LIBRARY) - use make frameworkinstall; \
--- 691,700 ----
@if test -d $(LIBRARY); then :; else \
if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
! 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; \