X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/bc981076c4f5909baf60d5508200117256b2018d..b55540f69066f9127c964af2097b7563ab69369c:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index a3e8508..42e4125 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.40 2000/08/06 10:50:55 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,14 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.40  2000/08/06 10:50:55  mdw
+## (mkphrase): New program for generating random passphrases with measured
+## strength.
+##
+## 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.
@@ -292,7 +300,7 @@ $(libcatacomb_la_OBJECTS) dsig.o keyutil.o rspit.o: mptypes.h primetab.h
 
 ## --- Utility programs ---
 
-bin_PROGRAMS = dsig key pixie rspit factorial hashsum
+bin_PROGRAMS = dsig key pixie rspit factorial hashsum mkphrase
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = \
 	genprimes mptypes \
@@ -308,6 +316,7 @@ rspit_SOURCES = rspit.c
 factorial_SOURCES = factorial.c
 pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c
 pixie_LDADD =
+mkphrase_SOURCES = mkphrase.c
 
 des_mktab_SOURCES = des-mktab.c
 des_mktab_LDADD =
@@ -333,8 +342,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 +362,7 @@ changequote(`, ')
 
 ## --- Documentation ---
 
-man_MANS = key.1 keyring.5
+man_MANS = key.1 hashsum.1 keyring.5 pixie.1
 
 ## --- Other handy definitions ---