Blob Blame Raw
From 9293031eee2e795d6712f1d92314be03fe6f0751 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Thu, 20 Feb 2014 15:31:05 -0800
Subject: [PATCH 90/90] Ticket #47709 - package issue in 389-ds-base

Description: Automatically generated files: Makefile.in, configure
(cherry picked from commit 99d5d3e59827c132ba2666c67f9e22bd62aaacab)
---
 Makefile.in | 65 ++++++++++++++++++++++++++++++++++++++++++-------------------
 configure   |  6 ++++++
 2 files changed, 51 insertions(+), 20 deletions(-)

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