Ticket #47709 - package issue in 389-ds-base

Description: Following the package guideline, moving pytyon binaries
to the architecture aware location and libns-dshttpd.so* from 389-ds-base
to 389-ds-base-libs.

https://fedorahosted.org/389/ticket/47709

Reviewed by [email protected] (Thank you, Rich!!)

Makefile.am

@@ -168,6 +168,7 @@ initdir = @initdir@
 initconfigdir = $(sysconfdir)@initconfigdir@
 instconfigdir = @instconfigdir@
 perldir = $(libdir)@perldir@
+pythondir = $(libdir)@pythondir@
 infdir = $(datadir)@infdir@
 mibdir = $(datadir)@mibdir@
 updatedir = $(datadir)@updatedir@
@@ -254,9 +255,7 @@ config_DATA = $(srcdir)/lib/ldaputil/certmap.conf \
 # with the default schema e.g. there is
 # considerable overlap of 60changelog.ldif and 01common.ldif
 # and 60inetmail.ldif and 50ns-mail.ldif among others
-sampledata_DATA = ldap/admin/src/scripts/failedbinds.py \
-	ldap/admin/src/scripts/DSSharedLib \
-	ldap/admin/src/scripts/logregex.py \
+sampledata_DATA = ldap/admin/src/scripts/DSSharedLib \
 	$(srcdir)/ldap/ldif/Ace.ldif \
 	$(srcdir)/ldap/ldif/European.ldif \
 	$(srcdir)/ldap/ldif/Eurosuffix.ldif \
@@ -408,6 +407,9 @@ perl_DATA = ldap/admin/src/scripts/SetupLog.pm \
 	ldap/admin/src/scripts/DSUpdate.pm \
 	ldap/admin/src/scripts/DSUpdateDialogs.pm
 
+python_DATA = ldap/admin/src/scripts/failedbinds.py \
+	ldap/admin/src/scripts/logregex.py
+
 property_DATA = ldap/admin/src/scripts/setup-ds.res \
 	ldap/admin/src/scripts/migrate-ds.res
 

configure.ac

@@ -264,6 +264,8 @@ if test "$with_fhs_opt" = "yes"; then
   propertydir=/properties
   # relative to libdir
   perldir=/perl
+  # relative to libdir
+  pythondir=/python
 else
   if test "$with_fhs" = "yes"; then
     ac_default_prefix=/usr
@@ -295,6 +297,8 @@ else
   propertydir=/$PACKAGE_NAME/properties
   # relative to libdir
   perldir=/$PACKAGE_NAME/perl
+  # relative to libdir
+  pythondir=/$PACKAGE_NAME/python
 fi
 
 # if mandir is the default value, override it
@@ -355,6 +359,23 @@ else
   with_perldir=
 fi
 
+AC_MSG_CHECKING(for --with-pythondir)
+AC_ARG_WITH([pythondir],
+   AS_HELP_STRING([--with-pythondir=PATH],
+                  [Directory for python)])
+)
+if test -n "$with_pythondir"; then
+  if test  "$with_pythondir" = yes ; then
+    AC_MSG_ERROR([You must specify --with-pythondir=/full/path/to/python])
+  elif test  "$with_pythondir" = no ; then
+    with_pythondir=
+  else
+    AC_MSG_RESULT([$with_pythondir])
+  fi
+else
+  with_pythondir=
+fi
+
 AC_MSG_CHECKING(for --with-systemdsystemunitdir)
 AC_ARG_WITH([systemdsystemunitdir],
    AS_HELP_STRING([--with-systemdsystemunitdir=PATH],
@@ -421,6 +442,7 @@ AC_SUBST(serverincdir)
 AC_SUBST(serverplugindir)
 AC_SUBST(scripttemplatedir)
 AC_SUBST(perldir)
+AC_SUBST(pythondir)
 AC_SUBST(infdir)
 AC_SUBST(mibdir)
 AC_SUBST(mandir)