summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2009-12-14 13:50:39 +0100
committerStephen Gallagher <sgallagh@redhat.com>2009-12-15 08:33:56 -0500
commit49babc8dca0eefbbdd56ef01839b9a80c62844f4 (patch)
tree774f66d6b597b06fa8309d70d8260032a3880ef3
parentf7d28f663a7d5f182d7aa1878b66d8467ca4cdc0 (diff)
downloadsssd-49babc8dca0eefbbdd56ef01839b9a80c62844f4.tar.gz
sssd-49babc8dca0eefbbdd56ef01839b9a80c62844f4.tar.bz2
sssd-49babc8dca0eefbbdd56ef01839b9a80c62844f4.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
-rw-r--r--server/Makefile.am15
-rw-r--r--server/configure.ac2
2 files changed, 13 insertions, 4 deletions
diff --git a/server/Makefile.am b/server/Makefile.am
index 0cd320dd..95d78ef8 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 2c788460..72b15cd0 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