135879e05a
- Use SHARED_LIBS - Bump PKGNAMEs spotted by naddy@ and sturm@ SHARED_LIBS tips from espie@
69 lines
2.5 KiB
Plaintext
69 lines
2.5 KiB
Plaintext
$OpenBSD: patch-Makefile_pre_in,v 1.2 2005/12/27 19:41:21 alek Exp $
|
|
--- Makefile.pre.in.orig Tue Jan 11 14:48:52 2005
|
|
+++ Makefile.pre.in Sat Dec 24 11:18:58 2005
|
|
@@ -308,7 +308,7 @@ all: $(BUILDPYTHON) oldsharedmods share
|
|
$(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
|
|
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
|
|
Modules/$(MAINOBJ) \
|
|
- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
|
+ -lpython$(VERSION) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
|
|
|
platform: $(BUILDPYTHON)
|
|
$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
|
|
@@ -357,6 +357,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
|
|
libpython$(VERSION).sl: $(LIBRARY_OBJS)
|
|
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
|
|
|
|
+# This rule for OpenBSD...
|
|
+$(LDLIBRARY): $(LIBRARY)
|
|
+ $(LDSHARED) -o $@ $(LIBRARY_OBJS)
|
|
+
|
|
+
|
|
# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
|
|
# minimal framework (not including the Lib directory and such) in the current
|
|
# directory.
|
|
@@ -587,7 +592,6 @@ bininstall: altbininstall
|
|
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
|
|
else true; \
|
|
fi
|
|
- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
|
|
|
|
# Install the interpreter with $(VERSION) affixed
|
|
# This goes into $(exec_prefix)
|
|
@@ -598,7 +602,7 @@ altbininstall: $(BUILDPYTHON)
|
|
exit 1; \
|
|
fi; \
|
|
fi
|
|
- @for i in $(BINDIR) $(LIBDIR); \
|
|
+ @for i in $(BINDIR) $(LIBDIR) $(LIBPL); \
|
|
do \
|
|
if test ! -d $(DESTDIR)$$i; then \
|
|
echo "Creating directory $$i"; \
|
|
@@ -607,14 +611,12 @@ altbininstall: $(BUILDPYTHON)
|
|
fi; \
|
|
done
|
|
$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
|
|
- if test -f libpython$(VERSION)$(SO); then \
|
|
+ if test -f $(LDLIBRARY); then \
|
|
if test "$(SO)" = .dll; then \
|
|
$(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(BINDIR); \
|
|
else \
|
|
- $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
|
|
- if test libpython$(VERSION)$(SO) != $(INSTSONAME); then \
|
|
- (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
|
|
- fi \
|
|
+ $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBPL)/$(LDLIBRARY); \
|
|
+ (cd $(DESTDIR)$(LIBDIR); $(LN) -s python$(VERSION)/config/$(LDLIBRARY)); \
|
|
fi; \
|
|
else true; \
|
|
fi
|
|
@@ -630,7 +632,7 @@ maninstall:
|
|
fi; \
|
|
done
|
|
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
|
|
- $(DESTDIR)$(MANDIR)/man1/python.1
|
|
+ $(DESTDIR)$(MANDIR)/man1/python2.3.1
|
|
|
|
# Install the library
|
|
PLATDIR= plat-$(MACHDEP)
|