Brandon Ehle wrote:
>
> Here's a patch to fix a regression in the install-swig-py-ext make target.
>
> * Makefile.in: "--prefix=$(DESTDIR)" is a incorrect line in the
> install-swig-py-ext statement. The correct behavior is to leave just
> the $(DISTUTIL_PARAM) and run "make install-swig-py-ext
> DISTUTIL_PARAM=--prefex=$(DESTDIR)" if you want the DESTDIR
> functionality (which doesn't make any sense anyway from a python
> perspective, the correct behaviour would be to supply the actual
> installed python dir. The current behavior breaks homedir installs, RPM
> building, and default installs.
>
> Index: Makefile.in
> ===================================================================
> --- Makefile.in (revision 4214)
> +++ Makefile.in (working copy)
> @@ -313,7 +313,7 @@
>
> install-swig-py-ext: swig-assert-available
> cd $(SWIG_BUILD_DIR)/python; \
> - $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
> --prefix=$(DESTDIR)$(prefix)
> + $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
>
> 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
Brandon,
This was a deliberate commit by Ben Collins, but I noticed
that it broke my Swig bindings also, but I'm a little reluctant to
back it out.
Maybe you and Ben should figure out a way to have this work for
both parties.
% svn diff -r 4190:4191
Index: Makefile.in
===================================================================
--- Makefile.in (revision 4190)
+++ Makefile.in (revision 4191)
@@ -313,7 +313,7 @@
install-swig-py-ext: swig-assert-available
cd $(SWIG_BUILD_DIR)/python; \
- $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM)
+ $(PYTHON) $(PYTHON_DISTUTIL) install $(DISTUTIL_PARAM) --prefix=$(DESTDIR)$(prefix)
swig-py-ext-clean:
rm -rf $(SWIG_BUILD_DIR)/python/build
% svn log -r 4191
------------------------------------------------------------------------
rev 4191: bcollins | 2002-12-23 10:36:06 -0800 (Mon, 23 Dec 2002) | 3 lines
* Makefile.in: Pass --prefix along with DESTDIR and $prefix to python swig
install path so that it honors DESTDIR (for dists builds).
------------------------------------------------------------------------
Best,
Blair
--
Blair Zajac <blair@orcaware.com>
Plots of your system's performance - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 3 03:42:44 2003