From 2232cda9fa68a12e3080ebfa517f6cfbd0166b9e Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Thu, 11 Oct 2007 00:56:40 +0300 Subject: [PATCH] Fixed python to use libdir provided by configure for SCRIPTDIR - SCRIPTDIR was hardcoded to $(prefix)/lib which is not very flexible in case we build multilib targets. New behavior is to use the libdir provided by configure so we will be able to handle lib, lib64 and lib32. --- python/python/libdir-from-configure.patch | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/python/python/libdir-from-configure.patch b/python/python/libdir-from-configure.patch index 923b93855..fd8d53f75 100644 --- a/python/python/libdir-from-configure.patch +++ b/python/python/libdir-from-configure.patch @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../python/libdir-from-configure.patch +# Filename: package/.../python/libdir-from-configure.patch +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -12,7 +13,7 @@ # of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- Fix pythons' Makefile template to take the bin and libdir from configure - @@ -20,9 +21,9 @@ fixes to use lib64 for architectures required. - Rene Rebe ---- Python-2.4.2/Makefile.pre.in 2005-03-29 01:23:01.000000000 +0200 -+++ Python-2.4.2-fixed/Makefile.pre.in 2006-02-05 11:51:57.403019250 +0100 -@@ -78,8 +78,8 @@ +--- Python-2.4.3/Makefile.pre.in.orig 2007-10-10 09:47:02.000000000 +0300 ++++ Python-2.4.3/Makefile.pre.in 2007-10-10 19:26:51.000000000 +0300 +@@ -78,12 +78,12 @@ exec_prefix= @exec_prefix@ # Expanded directories @@ -33,3 +34,8 @@ fixes to use lib64 for architectures required. MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include +-SCRIPTDIR= $(prefix)/lib ++SCRIPTDIR= @libdir@ + + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION)