* Makefile.in:
Cleanup the swig-py-ext and install-swig-py-ext targets so that
compiling swig on a platform where Subversion is not installed yet
is supported and install-swig-py-ext correctly builds before
installing.
Index: Makefile.in
===================================================================
--- Makefile.in (revision 4084)
+++ Makefile.in (working copy)
@@ -114,6 +114,22 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
+PYTHON_DISTUTIL=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 \
+ $(SWIG_LDFLAGS)
+
all: external-all local-all
clean: external-clean local-clean
distclean: external-distclean local-distclean
@@ -291,20 +307,11 @@
swig-py-ext: swig-assert-available
cd $(SWIG_SRC_DIR)/python; \
- $(PYTHON) setup.py \
- -I$(SWIG_SRC_DIR) \
- -I$(abs_srcdir)/subversion/include $(SVN_APR_INCLUDES) \
- -S$(SWIG_SRC_DIR) \
- -L$(DESTDIR)$(prefix)/lib -L$(SVN_APR_PREFIX)/lib \
- -s"$(SWIG)" \
- $(SWIG_LDFLAGS) \
- build --build-base=$(SWIG_BUILD_DIR)/python/build
+ $(PYTHON) $(PYTHON_DISTUTIL) build
install-swig-py-ext:
(cd $(SWIG_BUILD_DIR)/python; \
- $(PYTHON) $(SWIG_SRC_DIR)/python/setup.py \
- -S$(SWIG_SRC_DIR) \
- install --prefix $(DESTDIR)$(prefix))
+ $(PYTHON) $(PYTHON_DISTUTIL) install)
swig-py-ext-clean:
rm -rf $(SWIG_BUILD_DIR)/python/build
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Dec 11 03:45:59 2002