Changeset: 325713df0c9b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=325713df0c9b Modified Files: Branch: default Log Message:
Merge with Dec2011 branch. diffs (45 lines): diff --git a/buildtools/ChangeLog.Dec2011 b/buildtools/ChangeLog.Dec2011 --- a/buildtools/ChangeLog.Dec2011 +++ b/buildtools/ChangeLog.Dec2011 @@ -1,3 +1,7 @@ # ChangeLog file for buildtools # This file is updated with Maddlog +* Tue Feb 7 2012 Sjoerd Mullender <[email protected]> +- On Debian and Ubuntu, install Python modules in dist-packages instead + of site-packages. This fixed bug 2997. + diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py --- a/buildtools/autogen/autogen/am.py +++ b/buildtools/autogen/autogen/am.py @@ -1046,7 +1046,9 @@ def am_python(fd, var, python, am): fd.write("\t$(PYTHON) '%s' build\n" % f) fd.write('install-exec-local-%s:\n' % var) for f in python['FILES']: - fd.write("\t$(PYTHON) '%s' install --prefix='$(DESTDIR)$(prefix)'\n" % f) + # see buildtools/conf/rules.mk for PY_INSTALL_LAYOUT + # it is needed to install into dist-packages on Debian/Ubuntu + fd.write("\t$(PYTHON) '%s' install $(PY_INSTALL_LAYOUT) --prefix='$(DESTDIR)$(prefix)'\n" % f) fd.write('uninstall-local-%s:\n' % var) for pkgdir in sorted(pkgdirs, reverse = True): fd.write("\trm -r '$(DESTDIR)$(prefix)/$(PYTHON_LIBDIR)/%s'\n" % pkgdir) diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk --- a/buildtools/conf/rules.mk +++ b/buildtools/conf/rules.mk @@ -111,3 +111,8 @@ MX = $(top_builddir)/buildtools/Mx/Mx $(CP) $< $@ SUFFIXES-local: $(BUILT_SOURCES) + +ifdef DEB_BUILD_ARCH +# see buildtools/autogen/autogen/am.py:am_python() +PY_INSTALL_LAYOUT = --install-layout=deb +endif diff --git a/debian/python-monetdb.install b/debian/python-monetdb.install --- a/debian/python-monetdb.install +++ b/debian/python-monetdb.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/python2.6/site-packages/monetdb usr/lib/python2.6/site-packages -debian/tmp/usr/lib/python2.6/site-packages/python_monetdb-*.egg-info usr/lib/python2.6/site-packages +debian/tmp/usr/lib/python2.6/dist-packages/monetdb usr/lib/python2.6/dist-packages +debian/tmp/usr/lib/python2.6/dist-packages/python_monetdb-*.egg-info usr/lib/python2.6/dist-packages _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
