[backfire/packages] merge [28415] & [28416]
[openwrt/svn-archive/archive.git] / lang / xapian-bindings / patches / 010-build.patch
1 --- a/python/Makefile.am
2 +++ b/python/Makefile.am
3 @@ -23,7 +23,7 @@ pylibdir = @PYTHON_LIB@
4
5 # Install as _DATA rather than _SCRIPTS because we don't want to make these
6 # executable (they don't have a #! line).
7 -pylib_DATA = xapian.py xapian.pyc xapian.pyo
8 +pylib_DATA = xapian.py
9
10 pylib_LTLIBRARIES = _xapian.la
11
12 @@ -53,20 +53,12 @@ _xapian_la_LIBADD = $(XAPIAN_LIBS) $(PYT
13 xapian.py: modern/xapian.py
14 cp `test -f modern/xapian.py || echo '$(srcdir)/'`modern/xapian.py .
15
16 -# We "import _xapian" first so that if we fail to import the glue library
17 -# we don't generate a broken xapian.pyc or xapian.pyo.
18 -xapian.pyc: xapian.py _xapian$(PYTHON_SO)
19 - PYTHONPATH=. $(PYTHON) -c "import _xapian;import xapian"
20 -
21 -xapian.pyo: xapian.py _xapian$(PYTHON_SO)
22 - PYTHONPATH=. $(PYTHON) -O -c "import _xapian;import xapian"
23 -
24 _xapian$(PYTHON_SO): _xapian.la
25 $(LIBTOOL) --config > libtoolconfig.tmp
26 . ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
27 rm -f libtoolconfig.tmp
28
29 -CLEANFILES = _xapian$(PYTHON_SO) xapian.py xapian.pyc xapian.pyo testsuite.pyc
30 +CLEANFILES = _xapian$(PYTHON_SO) xapian.py testsuite.pyc
31
32 if MAINTAINER_MODE
33 # We need to explicitly set -outdir because on Windows, SWIG splits paths at
34 --- a/python/Makefile.in
35 +++ b/python/Makefile.in
36 @@ -292,14 +292,14 @@ pylibdir = @PYTHON_LIB@
37
38 # Install as _DATA rather than _SCRIPTS because we don't want to make these
39 # executable (they don't have a #! line).
40 -pylib_DATA = xapian.py xapian.pyc xapian.pyo
41 +pylib_DATA = xapian.py
42 pylib_LTLIBRARIES = _xapian.la
43 AM_CPPFLAGS = -I$(PYTHON_INC)
44 AM_CXXFLAGS = $(SWIG_CXXFLAGS) $(XAPIAN_CXXFLAGS)
45 _xapian_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)" $(NO_UNDEFINED)
46 _xapian_la_SOURCES = modern/xapian_wrap.cc
47 _xapian_la_LIBADD = $(XAPIAN_LIBS) $(PYTHON_LIBS)
48 -CLEANFILES = _xapian$(PYTHON_SO) xapian.py xapian.pyc xapian.pyo \
49 +CLEANFILES = _xapian$(PYTHON_SO) xapian.py \
50 testsuite.pyc $(am__append_2)
51 @MAINTAINER_MODE_FALSE@MAINTAINERCLEANFILES = $(BUILT_SOURCES)
52 all: $(BUILT_SOURCES)
53 @@ -819,14 +819,6 @@ uninstall-local:
54 xapian.py: modern/xapian.py
55 cp `test -f modern/xapian.py || echo '$(srcdir)/'`modern/xapian.py .
56
57 -# We "import _xapian" first so that if we fail to import the glue library
58 -# we don't generate a broken xapian.pyc or xapian.pyo.
59 -xapian.pyc: xapian.py _xapian$(PYTHON_SO)
60 - PYTHONPATH=. $(PYTHON) -c "import _xapian;import xapian"
61 -
62 -xapian.pyo: xapian.py _xapian$(PYTHON_SO)
63 - PYTHONPATH=. $(PYTHON) -O -c "import _xapian;import xapian"
64 -
65 _xapian$(PYTHON_SO): _xapian.la
66 $(LIBTOOL) --config > libtoolconfig.tmp
67 . ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .