Module Name: src
Committed By: agc
Date: Sat Nov 6 00:03:34 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.am
src/crypto/external/bsd/netpgp/dist/src/libmj: Makefile.am
src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile.am
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: Makefile.am
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.am
Log Message:
Avoid specifying the manual page twice in the Makefile.am files, which
can lead to problems at installation time on some platforms (RHEL 6,
for example), whereas Mac OS X seems to install things fine.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.7 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.8
--- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.7 Fri Nov 5 03:01:57 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am Sat Nov 6 00:03:32 2010
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.7 2010/11/05 03:01:57 agc Exp $
+## $NetBSD: Makefile.am,v 1.8 2010/11/06 00:03:32 agc Exp $
AM_CFLAGS = $(WARNCFLAGS)
@@ -28,6 +28,4 @@
LDADD = ../libmj/libmj.a
-man3_MANS = libnetpgp.3
-
dist_man_MANS = libnetpgp.3
Index: src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am
diff -u src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am:1.3 src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am:1.4
--- src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am:1.3 Fri Nov 5 03:37:19 2010
+++ src/crypto/external/bsd/netpgp/dist/src/libmj/Makefile.am Sat Nov 6 00:03:33 2010
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.3 2010/11/05 03:37:19 agc Exp $
+## $NetBSD: Makefile.am,v 1.4 2010/11/06 00:03:33 agc Exp $
AM_CFLAGS = $(WARNCFLAGS)
@@ -8,6 +8,4 @@
libmj_la_SOURCES = mj.c
-man3_MANS = libmj.3
-
dist_man_MANS = libmj.3
Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am:1.2 Fri Nov 5 07:39:59 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile.am Sat Nov 6 00:03:33 2010
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.2 2010/11/05 07:39:59 agc Exp $
+## $NetBSD: Makefile.am,v 1.3 2010/11/06 00:03:33 agc Exp $
AM_CFLAGS = $(WARNCFLAGS)
@@ -10,6 +10,4 @@
netpgp_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la
-man1_MANS = netpgp.1
-
dist_man_MANS = netpgp.1
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am:1.3 Fri Nov 5 07:40:41 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/Makefile.am Sat Nov 6 00:03:33 2010
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.3 2010/11/05 07:40:41 agc Exp $
+## $NetBSD: Makefile.am,v 1.4 2010/11/06 00:03:33 agc Exp $
AM_CFLAGS = $(WARNCFLAGS)
@@ -10,6 +10,4 @@
netpgpkeys_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la
-man1_MANS = netpgpkeys.1
-
dist_man_MANS = netpgpkeys.1
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am:1.3 Fri Nov 5 07:41:20 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.am Sat Nov 6 00:03:34 2010
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.3 2010/11/05 07:41:20 agc Exp $
+## $NetBSD: Makefile.am,v 1.4 2010/11/06 00:03:34 agc Exp $
AM_CFLAGS = $(WARNCFLAGS)
@@ -10,6 +10,4 @@
netpgpverify_LDADD = ../lib/libnetpgp.la ../libmj/libmj.la
-man1_MANS = netpgpverify.1
-
dist_man_MANS = netpgpverify.1
