|
 |
7c7f29 |
From 1d4ad57ad50a33b8a1ef2db7d592f2adb09c3083 Mon Sep 17 00:00:00 2001
|
|
|
7c7f29 |
From: William Brown <firstyear@redhat.com>
|
|
|
7c7f29 |
Date: Mon, 8 Aug 2016 13:56:02 +1000
|
|
|
7c7f29 |
Subject: [PATCH 31/32] Ticket 48450 - Autotools components for
|
|
|
7c7f29 |
ds_systemd_ask_password_acl
|
|
|
7c7f29 |
|
|
|
7c7f29 |
Bug Description: William forgot to add the Makefile.in to the commit. This was
|
|
|
7c7f29 |
found in the rpm build because it does not run autoreconf to regenerate the
|
|
|
7c7f29 |
Makefile.in, manifiesting as a missing file.
|
|
|
7c7f29 |
|
|
|
7c7f29 |
Fix Description: Commit Makefile.in
|
|
|
7c7f29 |
|
|
|
7c7f29 |
https://fedorahosted.org/389/ticket/48450
|
|
|
7c7f29 |
|
|
|
7c7f29 |
Author: wibrown
|
|
|
7c7f29 |
|
|
|
7c7f29 |
Review by: nhosoi@redhat.com
|
|
|
7c7f29 |
|
|
|
7c7f29 |
(cherry picked from commit c5e4ca4e1e0f1ab8be60df7453e6f0b126e6581c)
|
|
|
7c7f29 |
---
|
|
|
7c7f29 |
Makefile.in | 11 ++++++-----
|
|
|
7c7f29 |
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
7c7f29 |
|
|
|
7c7f29 |
diff --git a/Makefile.in b/Makefile.in
|
|
|
7c7f29 |
index 8109469..6788fe1 100644
|
|
|
7c7f29 |
--- a/Makefile.in
|
|
|
7c7f29 |
+++ b/Makefile.in
|
|
|
7c7f29 |
@@ -2044,7 +2044,8 @@ sbin_SCRIPTS = ldap/admin/src/scripts/setup-ds.pl \
|
|
|
7c7f29 |
ldap/admin/src/scripts/dbmon.sh \
|
|
|
7c7f29 |
ldap/admin/src/scripts/ds_selinux_enabled \
|
|
|
7c7f29 |
ldap/admin/src/scripts/ds_selinux_port_query \
|
|
|
7c7f29 |
- wrappers/ldap-agent
|
|
|
7c7f29 |
+ wrappers/ds_systemd_ask_password_acl \
|
|
|
7c7f29 |
+ wrappers/ldap-agent
|
|
|
7c7f29 |
|
|
|
7c7f29 |
bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
|
|
|
7c7f29 |
wrappers/dbscan \
|
|
|
7c7f29 |
@@ -10359,7 +10360,7 @@ distdir: $(DISTFILES)
|
|
|
7c7f29 |
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
|
|
7c7f29 |
|| chmod -R a+r "$(distdir)"
|
|
|
7c7f29 |
dist-gzip: distdir
|
|
|
7c7f29 |
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
|
|
7c7f29 |
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
|
|
|
7c7f29 |
$(am__post_remove_distdir)
|
|
|
7c7f29 |
dist-bzip2: distdir
|
|
|
7c7f29 |
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
|
|
|
7c7f29 |
@@ -10384,7 +10385,7 @@ dist-shar: distdir
|
|
|
7c7f29 |
@echo WARNING: "Support for shar distribution archives is" \
|
|
|
7c7f29 |
"deprecated." >&2
|
|
|
7c7f29 |
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
|
|
7c7f29 |
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
|
|
|
7c7f29 |
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
|
|
|
7c7f29 |
$(am__post_remove_distdir)
|
|
|
7c7f29 |
|
|
|
7c7f29 |
dist-zip: distdir
|
|
|
7c7f29 |
@@ -10402,7 +10403,7 @@ dist dist-all:
|
|
|
7c7f29 |
distcheck: dist
|
|
|
7c7f29 |
case '$(DIST_ARCHIVES)' in \
|
|
|
7c7f29 |
*.tar.gz*) \
|
|
|
7c7f29 |
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
|
|
|
7c7f29 |
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
|
|
|
7c7f29 |
*.tar.bz2*) \
|
|
|
7c7f29 |
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
|
|
|
7c7f29 |
*.tar.lz*) \
|
|
|
7c7f29 |
@@ -10412,7 +10413,7 @@ distcheck: dist
|
|
|
7c7f29 |
*.tar.Z*) \
|
|
|
7c7f29 |
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
|
|
7c7f29 |
*.shar.gz*) \
|
|
|
7c7f29 |
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
|
|
|
7c7f29 |
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
|
|
|
7c7f29 |
*.zip*) \
|
|
|
7c7f29 |
unzip $(distdir).zip ;;\
|
|
|
7c7f29 |
esac
|
|
|
7c7f29 |
--
|
|
|
7c7f29 |
2.4.11
|
|
|
7c7f29 |
|