From: Robin Dunn <robin@alldunn.com>
Date: Wed, 16 Mar 2005 22:53:59 +0000 (+0000)
Subject: The --enable-rpath configure option doesn't work the same way it did
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8da2fe32f997a122a07135d87423105f80039f15

The --enable-rpath configure option doesn't work the same way it did
before.  Work around that by specifying the rpath option myself on the
setup.py command-line.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 4ba8616a74..198b24a243 100644
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -184,7 +184,7 @@ cd bld
 ../configure --with-gtk \
 	--prefix=%{wxpref} \
 	--enable-monolithic \
-	--enable-rpath=%{wxpref}/lib \
+	--disable-rpath \
 	--with-opengl \
 	--enable-geometry \
 	--enable-optimise \
@@ -224,8 +224,9 @@ cd $WXDIR/wxPython
 	UNICODE=%{unicode} \
 	EP_ADD_OPTS=1 \
 	NO_SCRIPTS=1 \
-	WX_CONFIG="$WXDIR/bld/wx-config --inplace" \
-       	build
+	WX_CONFIG="$WXDIR/bld/wx-config --no_rpath" \
+       	build_ext --rpath=%{wxpref}/lib \
+	build
 
 
 
@@ -250,7 +251,8 @@ cd $WXDIR/wxPython
 	UNICODE=%{unicode} \
 	EP_ADD_OPTS=1 \
 	NO_SCRIPTS=1 \
-	WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
+	WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref} --no_rpath" \
+       	build_ext --rpath=%{wxpref}/lib \
 	install \
 	--root=$RPM_BUILD_ROOT