Fix error message in merge.

[u/mdw/catacomb] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index df761d2..b8d9316 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -220,7 +220,7 @@ libcatacomb_la_SOURCES = \
        grand.c keysz.c \
        lcrand.c fibrand.c rc4.c seal.c rand.c noise.c fipstest.c maurer.c \
        arena.c \
-       passphrase.c pixie-client.c pixie-common.c lmem.c \
+       passphrase.c pixie-common.c lmem.c \
        tlsprf.c sslprf.c \
        gfshare.c \
        MP_SOURCES karatsuba.h \
@@ -280,7 +280,7 @@ hashsum_SOURCES = hashsum.c
 rspit_SOURCES = rspit.c
 factorial_SOURCES = factorial.c
 perftest_SOURCES = perftest.c
-pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c
+pixie_SOURCES = pixie.c pixie-common.c lmem.c arena.c passphrase.c
 pixie_LDADD =
 mkphrase_SOURCES = mkphrase.c
 bittest_SOURCES = bittest.c
@@ -313,7 +313,7 @@ mpdump_LDADD =
 ## `install' if there are subdirectories.
 
 changequote(<, >)
-install: install-exec-hook
+# install: install-exec-hook
 install-exec-hook:
        @pixie="$(DESTDIR)$(bindir)/`echo pixie|sed $(transform)`"; \
        if chown root $$pixie && chmod 4755 $$pixie; then \
@@ -329,7 +329,7 @@ changequote(`, ')
 ## --- Documentation ---
 
 man_MANS = \
-       key.1 dsig.1 cookie.1 catcrypt.1 catsign.1 hashsum.1 \
+       key.1 dsig.1 cookie.1 catcrypt.1 catsign.1 hashsum.1 mkphrase.1 \
        keyring.5 pixie.1
 
 ## --- Other handy definitions ---