projects / packages / redland-bindings.git / blame
| Commit | Line | Data |
|---|---|---|
| f179a1c8 JB |
1 | --- redland-bindings-1.0.11.1/configure.ac.orig 2010-09-27 03:57:15.000000000 +0200 |
| 2 | +++ redland-bindings-1.0.11.1/configure.ac 2010-11-20 11:34:40.759094909 +0100 | |
| 3 | @@ -237,6 +237,7 @@ | |
| 4 | AC_ARG_VAR(PYTHON_LIBEXT, [Python shared library file extension]) | |
| 5 | AC_ARG_VAR(PYTHON_INCLUDES, [Install location of python includes]) | |
| 6 | AC_ARG_VAR(PYTHON_LIB, [Install location of python libraries]) | |
| 7 | +AC_ARG_VAR(PYTHON_SCRIPT, [Install location of python scripts]) | |
| 88036bd1 | 8 | |
| f179a1c8 JB |
9 | AC_MSG_CHECKING(Enable Python API) |
| 10 | if test "X$with_python" != Xno; then | |
| 11 | @@ -297,6 +298,14 @@ | |
| 12 | AC_MSG_RESULT($PYTHON_LIB) | |
| 13 | fi | |
| 14 | ||
| 15 | + AC_MSG_CHECKING(Python scripts) | |
| 16 | + if test "X$PYTHON_SCRIPT" != X; then | |
| 17 | + AC_MSG_RESULT(using user lib: $PYTHON_SCRIPT) | |
| 18 | + else | |
| 19 | + PYTHON_SCRIPT="${python_prefix}/share/python${PYTHON_VERSION}/site-packages" | |
| 20 | + AC_MSG_RESULT($PYTHON_SCRIPT) | |
| 21 | + fi | |
| 22 | + | |
| 23 | AC_MSG_CHECKING(Python LDFLAGS) | |
| 24 | if test "X$PYTHON_LDFLAGS" != X; then | |
| 25 | AC_MSG_RESULT(using user ldflags: $PYTHON_LDFLAGS) | |
| 6eb1667a JB |
26 | --- redland-bindings-1.0.17.1/python/Makefile.am.orig 2014-06-22 20:54:16.860247387 +0200 |
| 27 | +++ redland-bindings-1.0.17.1/python/Makefile.am 2014-06-22 21:06:07.313565911 +0200 | |
| 28 | @@ -47,6 +47,7 @@ | |
| 29 | SWIG_OUTPUTS=$(PYTHON_PACKAGE)_wrap.c Redland.py | |
| c5c628f0 | 30 | |
| 31 | pythondir=@PYTHON_LIB@ | |
| 9a35a6b2 | 32 | +pythonscriptdir=@PYTHON_SCRIPT@ |
| 6eb1667a | 33 | python_DATA=RDF.py $(PYTHON_FULL_DYLIB) Redland.py |
| c5c628f0 | 34 | |
| 35 | EXTRA_DIST=README RDF.py \ | |
| 6eb1667a | 36 | @@ -76,10 +77,10 @@ |
| 9a35a6b2 | 37 | touch $(PYTHON_PACKAGE)-stamp |
| c5c628f0 | 38 | |
| 39 | install-pythonDATA: $(python_DATA) | |
| 9a35a6b2 JB |
40 | - $(mkinstalldirs) $(DESTDIR)$(pythondir) |
| 41 | + $(mkinstalldirs) $(DESTDIR)$(pythondir) $(DESTDIR)$(pythonscriptdir) | |
| 6eb1667a | 42 | $(INSTALL_PROGRAM) $(PYTHON_FULL_DYLIB) $(DESTDIR)$(pythondir)/$(PYTHON_FULL_DYLIB) |
| c5c628f0 | 43 | - $(INSTALL_DATA) RDF.py $(DESTDIR)$(pythondir)/RDF.py |
| 6eb1667a | 44 | - $(INSTALL_DATA) Redland.py $(DESTDIR)$(pythondir)/Redland.py |
| 9a35a6b2 | 45 | + $(INSTALL_DATA) RDF.py $(DESTDIR)$(pythonscriptdir)/RDF.py |
| 6eb1667a | 46 | + $(INSTALL_DATA) Redland.py $(DESTDIR)$(pythonscriptdir)/Redland.py |
| c5c628f0 | 47 | |
| 48 | uninstall-pythonDATA: $(python_DATA) | |
| 6eb1667a | 49 | rm -f $(DESTDIR)$(pythondir)/$(PYTHON_FULL_DYLIB) $(DESTDIR)$(pythondir)/RDF.{py,pyc} $(DESTDIR)$(pythondir)/Redland.{py,pyc} |