From 525af7b81aef63b31a29d323e8c77577f8599c40 Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Sat, 29 Jul 2000 21:55:32 +0000
Subject: [PATCH] Make sure the pixie is installed setuid-root (workaround for
 an Automake bug).  Install new manpages.

---
 Makefile.m4 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile.m4 b/Makefile.m4
index a3e8508..f6c3b33 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.38 2000/07/29 10:54:55 mdw Exp $
+## $Id: Makefile.m4,v 1.39 2000/07/29 21:55:32 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,10 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.39  2000/07/29 21:55:32  mdw
+## Make sure the pixie is installed setuid-root (workaround for an Automake
+## bug).  Install new manpages.
+##
 ## Revision 1.38  2000/07/29 10:54:55  mdw
 ## Further fixing to support building using normal `make' again. ;-)  I
 ## think we're there now.
@@ -333,8 +337,12 @@ mptypes_SOURCES = mptypes.c
 mptypes_LDADD =
 
 ## --- Install the pixie setuid-root if we can ---
+##
+## Bodge around a bug in Automake: it doesn't call `install-exec-hook' from
+## `install' if there are subdirectories.
 
 changequote(<, >)
+install: install-exec-hook
 install-exec-hook:
 	@pixie="$(bindir)/`echo pixie|sed $(transform)`"; \
 	if chown root $$pixie && chmod 4755 $$pixie; then \
@@ -349,7 +357,7 @@ changequote(`, ')
 
 ## --- Documentation ---
 
-man_MANS = key.1 keyring.5
+man_MANS = key.1 hashsum.1 keyring.5 pixie.1
 
 ## --- Other handy definitions ---
 
-- 
2.11.0