Ticket #322: xapian-bindings-osx-uninstpath.patch

File xapian-bindings-osx-uninstpath.patch, 1.6 KB (added by Richard Boulton, 14 years ago)

Potential, but unpleasant, solution

  • xapian-bindings/python/Makefile.am 

    diff --git a/xapian-bindings/python/Makefile.am b/xapian-bindings/python/Makefile.am
index 40304bc..cac8046 100644
    a b  
    22
    33include ../generic/generic.mk
    44
     5UNINST_LIB_PATH = "@abs_builddir@/../../xapian-core/.libs"
     6
    57TESTS_ENVIRONMENT = trap 'rm -f "$(srcdir)"/*.pyc' 0 1 2 13 15; \
    6     PYTHONPATH=".:$$PYTHONPATH" PYTHONDONTWRITEBYTECODE=1 \
     8    PYTHONPATH=".:$$PYTHONPATH" DYLD_LIBRARY_PATH="$(UNINST_LIB_PATH)" PYTHONDONTWRITEBYTECODE=1 \
    79    abs_builddir=@abs_builddir@ $(PYTHON)
    810
    911## Test programs to be run
    … … xapian/__init__.py: modern/xapian.py  
    7072# We "import _xapian" first so that if we fail to import the glue library
    7173# we don't generate a broken __init__.pyc or __init__.pyo.
    7274xapian/__init__.pyc: xapian/__init__.py xapian/_xapian$(PYTHON_SO)
    73         PYTHONPATH="xapian:$$PYTHONPATH" $(PYTHON) -c "import _xapian"
    74         PYTHONPATH=".:$$PYTHONPATH" $(PYTHON) -c "import xapian"
     75        DYLD_LIBRARY_PATH=$(UNINST_LIB_PATH) PYTHONPATH="xapian:$$PYTHONPATH" $(PYTHON) -c "import _xapian"
     76        DYLD_LIBRARY_PATH=$(UNINST_LIB_PATH) PYTHONPATH=".:$$PYTHONPATH" $(PYTHON) -c "import xapian"
    7577
    7678xapian/__init__.pyo: xapian/__init__.py xapian/_xapian$(PYTHON_SO)
    77         PYTHONPATH="xapian:$$PYTHONPATH" $(PYTHON) -O -c "import _xapian"
    78         PYTHONPATH=".:$$PYTHONPATH" $(PYTHON) -O -c "import xapian"
     79        DYLD_LIBRARY_PATH=$(UNINST_LIB_PATH) PYTHONPATH="xapian:$$PYTHONPATH" $(PYTHON) -O -c "import _xapian"
     80        DYLD_LIBRARY_PATH=$(UNINST_LIB_PATH) PYTHONPATH=".:$$PYTHONPATH" $(PYTHON) -O -c "import xapian"
    7981
    8082xapian/_xapian$(PYTHON_SO): _xapian.la
    8183        -test -d xapian || mkdir xapian