|
 |
cc3dff |
From 9293031eee2e795d6712f1d92314be03fe6f0751 Mon Sep 17 00:00:00 2001
|
|
|
cc3dff |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
cc3dff |
Date: Thu, 20 Feb 2014 15:31:05 -0800
|
|
|
cc3dff |
Subject: [PATCH 90/90] Ticket #47709 - package issue in 389-ds-base
|
|
|
cc3dff |
|
|
|
cc3dff |
Description: Automatically generated files: Makefile.in, configure
|
|
|
cc3dff |
(cherry picked from commit 99d5d3e59827c132ba2666c67f9e22bd62aaacab)
|
|
|
cc3dff |
---
|
|
|
cc3dff |
Makefile.in | 65 ++++++++++++++++++++++++++++++++++++++++++-------------------
|
|
|
cc3dff |
configure | 6 ++++++
|
|
|
cc3dff |
2 files changed, 51 insertions(+), 20 deletions(-)
|
|
|
cc3dff |
|
|
|
cc3dff |
diff --git a/Makefile.in b/Makefile.in
|
|
|
cc3dff |
index d90f130..21d9dc5 100644
|
|
|
cc3dff |
--- a/Makefile.in
|
|
|
cc3dff |
+++ b/Makefile.in
|
|
|
cc3dff |
@@ -144,9 +144,9 @@ am__installdirs = "$(DESTDIR)$(serverdir)" \
|
|
|
cc3dff |
"$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" \
|
|
|
cc3dff |
"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" \
|
|
|
cc3dff |
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" \
|
|
|
cc3dff |
- "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" \
|
|
|
cc3dff |
- "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(updatedir)" \
|
|
|
cc3dff |
- "$(DESTDIR)$(serverincdir)"
|
|
|
cc3dff |
+ "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" \
|
|
|
cc3dff |
+ "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(systemdsystemunitdir)" \
|
|
|
cc3dff |
+ "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"
|
|
|
cc3dff |
LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
|
|
|
cc3dff |
am__DEPENDENCIES_1 =
|
|
|
cc3dff |
libacctpolicy_plugin_la_DEPENDENCIES = libslapd.la \
|
|
|
cc3dff |
@@ -1104,8 +1104,8 @@ NROFF = nroff
|
|
|
cc3dff |
MANS = $(dist_man_MANS)
|
|
|
cc3dff |
DATA = $(config_DATA) $(inf_DATA) $(initconfig_DATA) $(mib_DATA) \
|
|
|
cc3dff |
$(nodist_property_DATA) $(perl_DATA) $(pkgconfig_DATA) \
|
|
|
cc3dff |
- $(property_DATA) $(sampledata_DATA) $(schema_DATA) \
|
|
|
cc3dff |
- $(systemdsystemunit_DATA) $(update_DATA)
|
|
|
cc3dff |
+ $(property_DATA) $(python_DATA) $(sampledata_DATA) \
|
|
|
cc3dff |
+ $(schema_DATA) $(systemdsystemunit_DATA) $(update_DATA)
|
|
|
cc3dff |
HEADERS = $(serverinc_HEADERS)
|
|
|
cc3dff |
ETAGS = etags
|
|
|
cc3dff |
CTAGS = ctags
|
|
|
cc3dff |
@@ -1314,6 +1314,7 @@ prefix = @prefix@
|
|
|
cc3dff |
program_transform_name = @program_transform_name@
|
|
|
cc3dff |
propertydir = $(datadir)@propertydir@
|
|
|
cc3dff |
psdir = @psdir@
|
|
|
cc3dff |
+pythondir = $(libdir)@pythondir@
|
|
|
cc3dff |
sampledatadir = $(datadir)@sampledatadir@
|
|
|
cc3dff |
sasl_inc = @sasl_inc@
|
|
|
cc3dff |
sasl_lib = @sasl_lib@
|
|
|
cc3dff |
@@ -1519,9 +1520,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 |
@@ -1674,6 +1673,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 |
@@ -9547,6 +9549,27 @@ uninstall-propertyDATA:
|
|
|
cc3dff |
@list='$(property_DATA)'; test -n "$(propertydir)" || list=; \
|
|
|
cc3dff |
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
|
cc3dff |
dir='$(DESTDIR)$(propertydir)'; $(am__uninstall_files_from_dir)
|
|
|
cc3dff |
+install-pythonDATA: $(python_DATA)
|
|
|
cc3dff |
+ @$(NORMAL_INSTALL)
|
|
|
cc3dff |
+ @list='$(python_DATA)'; test -n "$(pythondir)" || list=; \
|
|
|
cc3dff |
+ if test -n "$$list"; then \
|
|
|
cc3dff |
+ echo " $(MKDIR_P) '$(DESTDIR)$(pythondir)'"; \
|
|
|
cc3dff |
+ $(MKDIR_P) "$(DESTDIR)$(pythondir)" || exit 1; \
|
|
|
cc3dff |
+ fi; \
|
|
|
cc3dff |
+ for p in $$list; do \
|
|
|
cc3dff |
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
|
cc3dff |
+ echo "$$d$$p"; \
|
|
|
cc3dff |
+ done | $(am__base_list) | \
|
|
|
cc3dff |
+ while read files; do \
|
|
|
cc3dff |
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pythondir)'"; \
|
|
|
cc3dff |
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pythondir)" || exit $$?; \
|
|
|
cc3dff |
+ done
|
|
|
cc3dff |
+
|
|
|
cc3dff |
+uninstall-pythonDATA:
|
|
|
cc3dff |
+ @$(NORMAL_UNINSTALL)
|
|
|
cc3dff |
+ @list='$(python_DATA)'; test -n "$(pythondir)" || list=; \
|
|
|
cc3dff |
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
|
|
cc3dff |
+ dir='$(DESTDIR)$(pythondir)'; $(am__uninstall_files_from_dir)
|
|
|
cc3dff |
install-sampledataDATA: $(sampledata_DATA)
|
|
|
cc3dff |
@$(NORMAL_INSTALL)
|
|
|
cc3dff |
@list='$(sampledata_DATA)'; test -n "$(sampledatadir)" || list=; \
|
|
|
cc3dff |
@@ -9903,7 +9926,7 @@ check: $(BUILT_SOURCES)
|
|
|
cc3dff |
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
|
|
|
cc3dff |
$(MANS) $(DATA) $(HEADERS) config.h
|
|
|
cc3dff |
installdirs:
|
|
|
cc3dff |
- for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"; do \
|
|
|
cc3dff |
+ for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"; do \
|
|
|
cc3dff |
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
|
|
cc3dff |
done
|
|
|
cc3dff |
install: $(BUILT_SOURCES)
|
|
|
cc3dff |
@@ -10058,7 +10081,7 @@ info-am:
|
|
|
cc3dff |
install-data-am: install-configDATA install-infDATA \
|
|
|
cc3dff |
install-initSCRIPTS install-initconfigDATA install-man \
|
|
|
cc3dff |
install-mibDATA install-nodist_propertyDATA install-perlDATA \
|
|
|
cc3dff |
- install-pkgconfigDATA install-propertyDATA \
|
|
|
cc3dff |
+ install-pkgconfigDATA install-propertyDATA install-pythonDATA \
|
|
|
cc3dff |
install-sampledataDATA install-schemaDATA \
|
|
|
cc3dff |
install-serverLTLIBRARIES install-serverincHEADERS \
|
|
|
cc3dff |
install-serverpluginLTLIBRARIES install-systemdsystemunitDATA \
|
|
|
cc3dff |
@@ -10116,10 +10139,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
|
|
|
cc3dff |
uninstall-initconfigDATA uninstall-man uninstall-mibDATA \
|
|
|
cc3dff |
uninstall-nodist_propertyDATA uninstall-perlDATA \
|
|
|
cc3dff |
uninstall-pkgconfigDATA uninstall-propertyDATA \
|
|
|
cc3dff |
- uninstall-sampledataDATA uninstall-sbinPROGRAMS \
|
|
|
cc3dff |
- uninstall-sbinSCRIPTS uninstall-schemaDATA \
|
|
|
cc3dff |
- uninstall-serverLTLIBRARIES uninstall-serverincHEADERS \
|
|
|
cc3dff |
- uninstall-serverpluginLTLIBRARIES \
|
|
|
cc3dff |
+ uninstall-pythonDATA uninstall-sampledataDATA \
|
|
|
cc3dff |
+ uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \
|
|
|
cc3dff |
+ uninstall-schemaDATA uninstall-serverLTLIBRARIES \
|
|
|
cc3dff |
+ uninstall-serverincHEADERS uninstall-serverpluginLTLIBRARIES \
|
|
|
cc3dff |
uninstall-systemdsystemunitDATA uninstall-taskSCRIPTS \
|
|
|
cc3dff |
uninstall-updateDATA uninstall-updateSCRIPTS
|
|
|
cc3dff |
|
|
|
cc3dff |
@@ -10145,8 +10168,9 @@ uninstall-man: uninstall-man1 uninstall-man8
|
|
|
cc3dff |
install-man1 install-man8 install-mibDATA \
|
|
|
cc3dff |
install-nodist_propertyDATA install-pdf install-pdf-am \
|
|
|
cc3dff |
install-perlDATA install-pkgconfigDATA install-propertyDATA \
|
|
|
cc3dff |
- install-ps install-ps-am install-sampledataDATA \
|
|
|
cc3dff |
- install-sbinPROGRAMS install-sbinSCRIPTS install-schemaDATA \
|
|
|
cc3dff |
+ install-ps install-ps-am install-pythonDATA \
|
|
|
cc3dff |
+ install-sampledataDATA install-sbinPROGRAMS \
|
|
|
cc3dff |
+ install-sbinSCRIPTS install-schemaDATA \
|
|
|
cc3dff |
install-serverLTLIBRARIES install-serverincHEADERS \
|
|
|
cc3dff |
install-serverpluginLTLIBRARIES install-strip \
|
|
|
cc3dff |
install-systemdsystemunitDATA install-taskSCRIPTS \
|
|
|
cc3dff |
@@ -10160,15 +10184,16 @@ uninstall-man: uninstall-man1 uninstall-man8
|
|
|
cc3dff |
uninstall-man1 uninstall-man8 uninstall-mibDATA \
|
|
|
cc3dff |
uninstall-nodist_propertyDATA uninstall-perlDATA \
|
|
|
cc3dff |
uninstall-pkgconfigDATA uninstall-propertyDATA \
|
|
|
cc3dff |
- uninstall-sampledataDATA uninstall-sbinPROGRAMS \
|
|
|
cc3dff |
- uninstall-sbinSCRIPTS uninstall-schemaDATA \
|
|
|
cc3dff |
- uninstall-serverLTLIBRARIES uninstall-serverincHEADERS \
|
|
|
cc3dff |
- uninstall-serverpluginLTLIBRARIES \
|
|
|
cc3dff |
+ uninstall-pythonDATA uninstall-sampledataDATA \
|
|
|
cc3dff |
+ uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \
|
|
|
cc3dff |
+ uninstall-schemaDATA uninstall-serverLTLIBRARIES \
|
|
|
cc3dff |
+ uninstall-serverincHEADERS uninstall-serverpluginLTLIBRARIES \
|
|
|
cc3dff |
uninstall-systemdsystemunitDATA uninstall-taskSCRIPTS \
|
|
|
cc3dff |
uninstall-updateDATA uninstall-updateSCRIPTS
|
|
|
cc3dff |
|
|
|
cc3dff |
|
|
|
cc3dff |
clean-local:
|
|
|
cc3dff |
+ -rm -rf dist
|
|
|
cc3dff |
-rm -rf selinux-built
|
|
|
cc3dff |
|
|
|
cc3dff |
dberrstrs.h: Makefile
|
|
|
cc3dff |
diff --git a/configure b/configure
|
|
|
cc3dff |
index 22cc78f..fd1bfb6 100755
|
|
|
cc3dff |
--- a/configure
|
|
|
cc3dff |
+++ b/configure
|
|
|
cc3dff |
@@ -720,6 +720,7 @@ defaultuser
|
|
|
cc3dff |
updatedir
|
|
|
cc3dff |
mibdir
|
|
|
cc3dff |
infdir
|
|
|
cc3dff |
+pythondir
|
|
|
cc3dff |
perldir
|
|
|
cc3dff |
scripttemplatedir
|
|
|
cc3dff |
serverplugindir
|
|
|
cc3dff |
@@ -17934,6 +17935,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 |
@@ -17963,6 +17966,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 |
@@ -18216,6 +18221,7 @@ fi
|
|
|
cc3dff |
|
|
|
cc3dff |
|
|
|
cc3dff |
|
|
|
cc3dff |
+
|
|
|
cc3dff |
# check for --with-instconfigdir
|
|
|
cc3dff |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-instconfigdir" >&5
|
|
|
cc3dff |
$as_echo_n "checking for --with-instconfigdir... " >&6; }
|
|
|
cc3dff |
--
|
|
|
cc3dff |
1.8.1.4
|
|
|
cc3dff |
|