Imported Debian patch 4.7.2-3

install/tools/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -102,8 +102,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/server.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \
-	$(am__DIST_COMMON)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_app_SCRIPTS) \
+	$(dist_noinst_DATA) $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -135,8 +135,10 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(appdir)" "$(DESTDIR)$(sbindir)"
-SCRIPTS = $(nodist_app_SCRIPTS) $(nodist_sbin_SCRIPTS)
+am__installdirs = "$(DESTDIR)$(appdir)" "$(DESTDIR)$(appdir)" \
+	"$(DESTDIR)$(sbindir)"
+SCRIPTS = $(dist_app_SCRIPTS) $(nodist_app_SCRIPTS) \
+	$(nodist_sbin_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -278,8 +280,6 @@ JSLINT = @JSLINT@
 KRAD_LIBS = @KRAD_LIBS@
 KRB5KDC_SERVICE = @KRB5KDC_SERVICE@
 KRB5_CFLAGS = @KRB5_CFLAGS@
-KRB5_GSSAPI_CFLAGS = @KRB5_GSSAPI_CFLAGS@
-KRB5_GSSAPI_LIBS = @KRB5_GSSAPI_LIBS@
 KRB5_LIBS = @KRB5_LIBS@
 LD = @LD@
 LDAP_CFLAGS = @LDAP_CFLAGS@
@@ -322,10 +322,11 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 NSPR_CFLAGS = @NSPR_CFLAGS@
 NSPR_LIBS = @NSPR_LIBS@
+NSS_CFLAGS = @NSS_CFLAGS@
+NSS_LIBS = @NSS_LIBS@
 NUM_VERSION = @NUM_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-ODS_GROUP = @ODS_GROUP@
 ODS_USER = @ODS_USER@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -346,6 +347,8 @@ POPT_LIBS = @POPT_LIBS@
 POSUB = @POSUB@
 PYLINT = @PYLINT@
 PYTHON = @PYTHON@
+PYTHON2 = @PYTHON2@
+PYTHON3 = @PYTHON3@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_INSTALL_EXTRA_OPTIONS = @PYTHON_INSTALL_EXTRA_OPTIONS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
@@ -433,9 +436,7 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
-selinux_makefile = @selinux_makefile@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
@@ -475,14 +476,10 @@ dist_noinst_DATA = \
 	ipa-cacert-manage.in	\
 	ipa-winsync-migrate.in	\
 	ipa-pkinit-manage.in	\
-	ipa-crlgen-manage.in	\
-	ipa-cert-fix.in		\
 	ipa-custodia.in		\
 	ipa-custodia-check.in	\
 	ipa-httpd-kdcproxy.in	\
-	ipa-httpd-pwdreader.in	\
 	ipa-pki-retrieve-key.in	\
-	ipa-pki-wait-running.in	\
 	$(NULL)
 
 nodist_sbin_SCRIPTS = \
@@ -509,8 +506,6 @@ nodist_sbin_SCRIPTS = \
 	ipa-cacert-manage	\
 	ipa-winsync-migrate	\
 	ipa-pkinit-manage	\
-	ipa-crlgen-manage	\
-	ipa-cert-fix		\
 	$(NULL)
 
 appdir = $(libexecdir)/ipa/
@@ -518,9 +513,11 @@ nodist_app_SCRIPTS = \
 	ipa-custodia		\
 	ipa-custodia-check	\
 	ipa-httpd-kdcproxy	\
-	ipa-httpd-pwdreader	\
 	ipa-pki-retrieve-key	\
-	ipa-pki-wait-running	\
+	$(NULL)
+
+dist_app_SCRIPTS = \
+	ipa-httpd-pwdreader	\
 	$(NULL)
 
 PYTHON_SHEBANG = \
@@ -562,6 +559,41 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+install-dist_appSCRIPTS: $(dist_app_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_app_SCRIPTS)'; test -n "$(appdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(appdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(appdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(appdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(appdir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-dist_appSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_app_SCRIPTS)'; test -n "$(appdir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	dir='$(DESTDIR)$(appdir)'; $(am__uninstall_files_from_dir)
 install-nodist_appSCRIPTS: $(nodist_app_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	@list='$(nodist_app_SCRIPTS)'; test -n "$(appdir)" || list=; \
@@ -801,7 +833,7 @@ check: check-recursive
 all-am: Makefile $(SCRIPTS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(appdir)" "$(DESTDIR)$(sbindir)"; do \
+	for dir in "$(DESTDIR)$(appdir)" "$(DESTDIR)$(appdir)" "$(DESTDIR)$(sbindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -855,7 +887,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-nodist_appSCRIPTS
+install-data-am: install-dist_appSCRIPTS install-nodist_appSCRIPTS
 
 install-dvi: install-dvi-recursive
 
@@ -899,7 +931,8 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-nodist_appSCRIPTS uninstall-nodist_sbinSCRIPTS
+uninstall-am: uninstall-dist_appSCRIPTS uninstall-nodist_appSCRIPTS \
+	uninstall-nodist_sbinSCRIPTS
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
@@ -907,28 +940,27 @@ uninstall-am: uninstall-nodist_appSCRIPTS uninstall-nodist_sbinSCRIPTS
 	check-am clean clean-generic clean-libtool cscopelist-am ctags \
 	ctags-am distclean distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
+	install install-am install-data install-data-am \
+	install-dist_appSCRIPTS install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man \
 	install-nodist_appSCRIPTS install-nodist_sbinSCRIPTS \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-nodist_appSCRIPTS uninstall-nodist_sbinSCRIPTS
+	uninstall-dist_appSCRIPTS uninstall-nodist_appSCRIPTS \
+	uninstall-nodist_sbinSCRIPTS
 
 .PRECIOUS: Makefile
 
 
 # special handling of Python scripts with auto-generated shebang line
 $(PYTHON_SHEBANG):%: %.in Makefile
-	$(AM_V_GEN)sed -e 's|^#!/usr/bin/python3.*|#!$(PYTHON) -I|g' $< > $@
+	$(AM_V_GEN)sed -e 's|@PYTHONSHEBANG[@]|#!$(PYTHON) -E|g' $< > $@
 	$(AM_V_GEN)chmod +x $@
 
-.PHONY: python_scripts_sub
-python_scripts_sub: $(PYTHON_SHEBANG)
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: