|
 |
cc3dff |
From 8cbc6f09ee63f21b235219e7ca92ed26b28c52da Mon Sep 17 00:00:00 2001
|
|
|
cc3dff |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
cc3dff |
Date: Thu, 20 Feb 2014 13:18:06 -0800
|
|
|
cc3dff |
Subject: [PATCH 89/90] Ticket #47709 - package issue in 389-ds-base
|
|
|
cc3dff |
|
|
|
cc3dff |
Description: Following the package guideline, moving pytyon binaries
|
|
|
cc3dff |
to the architecture aware location and libns-dshttpd.so* from 389-ds-base
|
|
|
cc3dff |
to 389-ds-base-libs.
|
|
|
cc3dff |
|
|
|
cc3dff |
https://fedorahosted.org/389/ticket/47709
|
|
|
cc3dff |
|
|
|
cc3dff |
Reviewed by rmeggins@redhat.com (Thank you, Rich!!)
|
|
|
cc3dff |
|
|
|
cc3dff |
(cherry picked from commit a32b2a9ddc5764d449b051c20077643585e81def)
|
|
|
cc3dff |
(cherry picked from commit 011385ad8cb8afc42611b57a3a88600eb1d56932)
|
|
|
cc3dff |
(cherry picked from commit f1bbfe2ff0768128b10903ca1262302313b74ad6)
|
|
|
cc3dff |
---
|
|
|
cc3dff |
Makefile.am | 8 +++++---
|
|
|
cc3dff |
configure.ac | 5 +++++
|
|
|
cc3dff |
2 files changed, 10 insertions(+), 3 deletions(-)
|
|
|
cc3dff |
|
|
|
cc3dff |
diff --git a/Makefile.am b/Makefile.am
|
|
|
cc3dff |
index 8cf7ba7..04845a0 100644
|
|
|
cc3dff |
--- a/Makefile.am
|
|
|
cc3dff |
+++ b/Makefile.am
|
|
|
cc3dff |
@@ -166,6 +166,7 @@ initdir = @initdir@
|
|
|
cc3dff |
initconfigdir = $(sysconfdir)@initconfigdir@
|
|
|
cc3dff |
instconfigdir = @instconfigdir@
|
|
|
cc3dff |
perldir = $(libdir)@perldir@
|
|
|
cc3dff |
+pythondir = $(libdir)@pythondir@
|
|
|
cc3dff |
infdir = $(datadir)@infdir@
|
|
|
cc3dff |
mibdir = $(datadir)@mibdir@
|
|
|
cc3dff |
updatedir = $(datadir)@updatedir@
|
|
|
cc3dff |
@@ -250,9 +251,7 @@ config_DATA = $(srcdir)/lib/ldaputil/certmap.conf \
|
|
|
cc3dff |
# with the default schema e.g. there is
|
|
|
cc3dff |
# considerable overlap of 60changelog.ldif and 01common.ldif
|
|
|
cc3dff |
# and 60inetmail.ldif and 50ns-mail.ldif among others
|
|
|
cc3dff |
-sampledata_DATA = ldap/admin/src/scripts/failedbinds.py \
|
|
|
cc3dff |
- ldap/admin/src/scripts/DSSharedLib \
|
|
|
cc3dff |
- ldap/admin/src/scripts/logregex.py \
|
|
|
cc3dff |
+sampledata_DATA = ldap/admin/src/scripts/DSSharedLib \
|
|
|
cc3dff |
$(srcdir)/ldap/ldif/Ace.ldif \
|
|
|
cc3dff |
$(srcdir)/ldap/ldif/European.ldif \
|
|
|
cc3dff |
$(srcdir)/ldap/ldif/Eurosuffix.ldif \
|
|
|
cc3dff |
@@ -404,6 +403,9 @@ perl_DATA = ldap/admin/src/scripts/SetupLog.pm \
|
|
|
cc3dff |
ldap/admin/src/scripts/DSUpdate.pm \
|
|
|
cc3dff |
ldap/admin/src/scripts/DSUpdateDialogs.pm
|
|
|
cc3dff |
|
|
|
cc3dff |
+python_DATA = ldap/admin/src/scripts/failedbinds.py \
|
|
|
cc3dff |
+ ldap/admin/src/scripts/logregex.py
|
|
|
cc3dff |
+
|
|
|
cc3dff |
property_DATA = ldap/admin/src/scripts/setup-ds.res \
|
|
|
cc3dff |
ldap/admin/src/scripts/migrate-ds.res
|
|
|
cc3dff |
|
|
|
cc3dff |
diff --git a/configure.ac b/configure.ac
|
|
|
cc3dff |
index 2376b34..908683e 100644
|
|
|
cc3dff |
--- a/configure.ac
|
|
|
cc3dff |
+++ b/configure.ac
|
|
|
cc3dff |
@@ -264,6 +264,8 @@ if test "$with_fhs_opt" = "yes"; then
|
|
|
cc3dff |
propertydir=/properties
|
|
|
cc3dff |
# relative to libdir
|
|
|
cc3dff |
perldir=/perl
|
|
|
cc3dff |
+ # relative to libdir
|
|
|
cc3dff |
+ pythondir=/python
|
|
|
cc3dff |
else
|
|
|
cc3dff |
if test "$with_fhs" = "yes"; then
|
|
|
cc3dff |
ac_default_prefix=/usr
|
|
|
cc3dff |
@@ -295,6 +297,8 @@ else
|
|
|
cc3dff |
propertydir=/$PACKAGE_NAME/properties
|
|
|
cc3dff |
# relative to libdir
|
|
|
cc3dff |
perldir=/$PACKAGE_NAME/perl
|
|
|
cc3dff |
+ # relative to libdir
|
|
|
cc3dff |
+ pythondir=/$PACKAGE_NAME/python
|
|
|
cc3dff |
fi
|
|
|
cc3dff |
|
|
|
cc3dff |
# if mandir is the default value, override it
|
|
|
cc3dff |
@@ -403,6 +407,7 @@ AC_SUBST(serverincdir)
|
|
|
cc3dff |
AC_SUBST(serverplugindir)
|
|
|
cc3dff |
AC_SUBST(scripttemplatedir)
|
|
|
cc3dff |
AC_SUBST(perldir)
|
|
|
cc3dff |
+AC_SUBST(pythondir)
|
|
|
cc3dff |
AC_SUBST(infdir)
|
|
|
cc3dff |
AC_SUBST(mibdir)
|
|
|
cc3dff |
AC_SUBST(mandir)
|
|
|
cc3dff |
--
|
|
|
cc3dff |
1.8.1.4
|
|
|
cc3dff |
|