From b13561c71119e39a64b1d4f17657418bec23be14 Mon Sep 17 00:00:00 2001
From: Daniel Elstner <daniel.kitta@gmail.com>
Date: Fri, 21 Aug 2015 00:36:20 +0200
Subject: Build: Suggest ACLOCAL_PATH instead of ACLOCAL_FLAGS

* Makefile.am (postinst-acdir-notice): If the installed macros
are not on the aclocal search patch, suggest the modern solution
of setting ACLOCAL_PATH instead of ACLOCAL_FLAGS.
---
 Makefile.am | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4430391..c1c2063 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,13 +173,12 @@ install-data-hook: $(if $(DESTDIR),,postinst-acdir-notice)
 postinst-acdir-notice:
 	@$(POST_INSTALL)
 	@-acdir=`$${ACLOCAL-aclocal} --print-ac-dir 2>/dev/null || :`; \
-	if test "x$$acdir" = 'x$(aclocal_macrodir)'; then :; else \
-	  case " $$ACLOCAL_FLAGS " in *' -I $(aclocal_macrodir) '*) ;; *) \
-	    echo; echo 'NOTICE:'; echo; \
-	    echo 'The $(PACKAGE_NAME) Autoconf macro files have been installed in a different'; \
-	    echo 'prefix than the system aclocal directory.  In order for the installed'; \
-	    echo 'macros to be found, it may be necessary to add the $(PACKAGE_NAME) include'; \
-	    echo 'path to the ACLOCAL_FLAGS environment variable:'; echo; \
-	    echo "  ACLOCAL_FLAGS='-I $(aclocal_macrodir)'; export ACLOCAL_FLAGS"; echo;; \
-	  esac; \
-	fi
+	case ":$$ACLOCAL_PATH:$$acdir:" in *':$(aclocal_macrodir):'*) ;; *) \
+	  echo; echo 'NOTICE:'; echo; \
+	  echo 'The $(PACKAGE_NAME) Autoconf macro files have been installed in a different'; \
+	  echo 'prefix than the system aclocal directory.  In order for the installed'; \
+	  echo 'macros to be found, it may be necessary to add the $(PACKAGE_NAME) include'; \
+	  echo 'path to the ACLOCAL_PATH environment variable:'; echo; \
+	  echo '  ACLOCAL_PATH="$(aclocal_macrodir)"'; \
+	  echo '  export ACLOCAL_PATH'; echo;; \
+	esac
-- 
cgit v1.2.1