diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2010-05-06 09:00:37 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-05-16 13:28:43 -0400 |
| commit | 6597b6ee3c848079c11975e4d9d02a567fdb7cf6 (patch) | |
| tree | d8c76e14d54b22b7b2244f66b2694ac98b9b4d6e | |
| parent | d2832558f9959387d50b73616260ef2d21c8902f (diff) | |
| download | sssd_unused-6597b6ee3c848079c11975e4d9d02a567fdb7cf6.tar.gz sssd_unused-6597b6ee3c848079c11975e4d9d02a567fdb7cf6.tar.xz sssd_unused-6597b6ee3c848079c11975e4d9d02a567fdb7cf6.zip | |
Allow Debian/Ubuntu build to pass --install-layout=deb to setup.py
| -rw-r--r-- | src/Makefile.am | 9 | ||||
| -rw-r--r-- | src/external/platform.m4 | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 530ccfe0..86c497e5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,11 @@ builddir ?= . DOXYGEN = @DOXYGEN@ +DISTSETUPOPTS = +if HAVE_DEBIAN +DISTSETUPOPTS += --install-layout=deb +endif + sssdlibexecdir = $(libexecdir)/sssd sssdlibdir = $(libdir)/sssd ldblibdir = @ldblibdir@ @@ -990,9 +995,9 @@ all-local: install-exec-hook: installsssddirs if [ "$(DESTDIR)" = "" ]; then \ - cd $(srcdir)/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/config install --prefix=$(PYTHON_PREFIX) --record=$(abs_builddir)/config/.files; \ + cd $(srcdir)/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/config install $(DISTSETUPOPTS) --prefix=$(PYTHON_PREFIX) --record=$(abs_builddir)/config/.files; \ else \ - cd $(srcdir)/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/config install --prefix=$(PYTHON_PREFIX) --root=$(DESTDIR) --record=$(abs_builddir)/config/.files; \ + cd $(srcdir)/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/config install $(DISTSETUPOPTS) --prefix=$(PYTHON_PREFIX) --root=$(DESTDIR) --record=$(abs_builddir)/config/.files; \ fi mkdir -p doc $(DESTDIR)/$(docdir); cp -a doc $(DESTDIR)/$(docdir)/ diff --git a/src/external/platform.m4 b/src/external/platform.m4 index ee009378..b7899b4b 100644 --- a/src/external/platform.m4 +++ b/src/external/platform.m4 @@ -5,7 +5,8 @@ osname="" if test x"$with_os" != x ; then if test x"$with_os" == xfedora -o \ x"$with_os" == xredhat -o \ - x"$with_os" == xsuse ; then + x"$with_os" == xsuse -o \ + x"$with_os" == xdebian ; then osname=$with_os else AC_MSG_ERROR([Illegal value -$with_os- for option --with-os]) @@ -19,14 +20,17 @@ if test x"$osname" = x ; then osname="redhat" elif test -f /etc/SuSE-release ; then osname="suse" + elif test -f /etc/debian_version ; then + osname="debian" fi - AC_MSG_NOTICE([Detected operation system type: $osname]) + AC_MSG_NOTICE([Detected operating system type: $osname]) fi AM_CONDITIONAL([HAVE_FEDORA], [test x"$osname" == xfedora]) AM_CONDITIONAL([HAVE_REDHAT], [test x"$osname" == xredhat]) AM_CONDITIONAL([HAVE_SUSE], [test x"$osname" == xsuse]) +AM_CONDITIONAL([HAVE_DEBIAN], [test x"$osname" == xdebian]) AC_CHECK_MEMBERS([struct ucred.pid, struct ucred.uid, struct ucred.gid], , , [[#define _GNU_SOURCE |