From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sun, 27 Feb 2005 18:08:30 +0000 (+0000)
Subject: Fix for PR automake/448:
X-Git-Tag: Release-1-9b~177
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e74ab22392f945d629f099386db6280bfe0668cf;p=thirdparty%2Fautomake.git

Fix for PR automake/448:
* automake.in (handle_factored_dependencies): Flag install-hook as
an error.
* tests/insthook.test: Exercise this.
---

diff --git a/ChangeLog b/ChangeLog
index 1851b88dc..52d27ff9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-02-27  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	Fix for PR automake/448:
+	* automake.in (handle_factored_dependencies): Flag install-hook as
+	an error.
+	* tests/insthook.test: Exercise this.
+
 	* m4/lispdir.m4: Use datarootdir instead of datadir to match GCS.
 	* doc/automake.texi (Hard-Coded Install Paths): Adjust.
 
diff --git a/automake.in b/automake.in
index 103cf9808..5dc68a10b 100755
--- a/automake.in
+++ b/automake.in
@@ -4441,6 +4441,10 @@ sub handle_factored_dependencies
 	       "use `install-data-local' or `install-exec-local', "
 	       . "not `install-local'");
 
+  reject_rule ('install-hook',
+	       "use `install-data-hook' or `install-exec-hook', "
+	       . "not `install-hook'");
+
   # Install the -local hooks.
   foreach (keys %dependencies)
     {
diff --git a/tests/insthook.test b/tests/insthook.test
index 2b05805b0..b924d20e7 100755
--- a/tests/insthook.test
+++ b/tests/insthook.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -66,3 +66,14 @@ VERSION=2.0 $MAKE -e install
 grep 1 bin/foo-1.0
 grep 2 bin/foo-2.0
 grep 2 bin/foo
+
+
+# install-hook is an error.
+cat >>Makefile.am <<EOF
+install-hook:
+	echo test
+EOF
+
+AUTOMAKE_fails
+grep install-data-hook stderr
+grep install-exec-hook stderr