diff options
| author | Sumit Bose <sbose@redhat.com> | 2009-12-14 13:50:39 +0100 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-12-15 07:23:57 -0500 |
| commit | 7cd60b6c6143af1e70659fa3ff980c22366a4e18 (patch) | |
| tree | c997dae9cdfe8f9e1617e119450bc2816b5f5773 /server | |
| parent | 4ffdb7446f8db624263c2163ba623281f312e3b6 (diff) | |
| download | sssd-7cd60b6c6143af1e70659fa3ff980c22366a4e18.tar.gz sssd-7cd60b6c6143af1e70659fa3ff980c22366a4e18.tar.xz sssd-7cd60b6c6143af1e70659fa3ff980c22366a4e18.zip | |
Build python modules in builddir
This requires increasing the required autoconf version to 2.59 for
use of $(abs_builddir).
Fix uninstallation of python files as well
Diffstat (limited to 'server')
| -rw-r--r-- | server/Makefile.am | 15 | ||||
| -rw-r--r-- | server/configure.ac | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 0cd320ddd..95d78ef8b 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -807,15 +807,24 @@ installsssddirs:: $(DESTDIR)$(logpath) \ $(DESTDIR)$(pubconfpath) +all-local: + cd $(srcdir)/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/config + install-exec-hook: installsssddirs if [ "$(DESTDIR)" = "" ]; then \ - cd $(srcdir)/config; $(PYTHON) setup.py install --prefix=$(PYTHON_PREFIX); \ + cd $(srcdir)/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/config install --prefix=$(PYTHON_PREFIX) --record=$(abs_builddir)/config/.files; \ else \ - cd $(srcdir)/config; $(PYTHON) setup.py install --prefix=$(PYTHON_PREFIX) --root=$(DESTDIR); \ + cd $(srcdir)/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/config install --prefix=$(PYTHON_PREFIX) --root=$(DESTDIR) --record=$(abs_builddir)/config/.files; \ + fi + +uninstall-hook: + if [ -f $(abs_builddir)/config/.files ]; then \ + cat $(abs_builddir)/config/.files | xargs -iq rm -f $(DESTDIR)/q; \ + rm $(abs_builddir)/config/.files ; \ fi clean-local: - cd $(srcdir)/config; $(PYTHON) setup.py clean --all + cd $(srcdir)/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/config clean --all CLEANFILES = *.X */*.X */*/*.X diff --git a/server/configure.ac b/server/configure.ac index 2c7884605..72b15cd0e 100644 --- a/server/configure.ac +++ b/server/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ(2.50) +AC_PREREQ(2.59) AC_DEFUN([AC_CHECK_LIB_EXT], [ AC_CHECK_LIB([$1],[$3],[$4],[$5],[$7]) ac_cv_lib_ext_$1_$3=$ac_cv_lib_$1_$3 |