One last patch for you, this fixes the out-of-directory compiling for
the swig bindings at any depth.
Also, unless nobody plans on using the ra module, you should also take a
look at committing that patch as well.
* Makefile.in, subversion/bindings/swig/python/setup.py:
Fix out-of-directory compiles for the swig python bindings.
Index: Makefile.in
===================================================================
--- Makefile.in (revision 4092)
+++ Makefile.in (working copy)
@@ -116,20 +116,20 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-PYTHON_DISTUTIL = setup.py \
+PYTHON_DISTUTIL = $(SWIG_SRC_DIR)/python/setup.py \
-I$(SWIG_SRC_DIR) \
-I$(abs_srcdir)/subversion/include $(SVN_APR_INCLUDES) \
-S$(SWIG_SRC_DIR) \
-s"$(SWIG)" \
-L$(SVN_APR_PREFIX)/lib \
- -L../../../libsvn_client/.libs \
- -L../../../libsvn_delta/.libs \
- -L../../../libsvn_fs/.libs \
- -L../../../libsvn_ra/.libs \
- -L../../../libsvn_repos/.libs \
- -L../../../libsvn_wc/.libs \
- -L../../../libsvn_subr/.libs \
- -L../../../bindings/swig/.libs \
+
-L$(abs_builddir)/subversion/libsvn_client/.libs \
+
-L$(abs_builddir)/subversion/libsvn_delta/.libs \
+
-L$(abs_builddir)/subversion/libsvn_fs/.libs \
+
-L$(abs_builddir)/subversion/libsvn_ra/.libs \
+
-L$(abs_builddir)/subversion/libsvn_repos/.libs \
+
-L$(abs_builddir)/subversion/libsvn_wc/.libs \
+
-L$(abs_builddir)/subversion/libsvn_subr/.libs \
+
-L$(abs_builddir)/subversion/bindings/swig/.libs \
$(SWIG_LDFLAGS)
all: external-all local-all
@@ -308,7 +308,7 @@
swig-clean: swig-py-ext-clean swig-java-ext-clean
swig-py-ext: swig-assert-available
- cd $(SWIG_SRC_DIR)/python; \
+ cd $(SWIG_BUILD_DIR)/python; \
$(PYTHON) $(PYTHON_DISTUTIL) build
install-swig-py-ext: swig-assert-available
Index: subversion/bindings/swig/python/setup.py
===================================================================
--- subversion/bindings/swig/python/setup.py (revision 4092)
+++ subversion/bindings/swig/python/setup.py (working copy)
@@ -126,6 +126,7 @@
packages=['svn'],
+ package_dir={"":source_dir+'/python'},
include_dirs=include_dirs,
ext_package="svn",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Dec 11 23:22:18 2002