From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 31 Jan 2009 16:35:42 +0000 (-0500)
Subject: add pem2openpgp to make install target
X-Git-Tag: monkeysphere_0.23~163^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c066aca91e4e9595bb0c709673dfc5a51666b4c9;p=monkeysphere.git

add pem2openpgp to make install target
add link to pem2openpgp in openpgp2ssh man page
Merge commit 'micah/master'

Conflicts:

	doc/george/changelog
---

c066aca91e4e9595bb0c709673dfc5a51666b4c9
diff --cc Makefile
index e40c4b1,7493b1f..8d9ab2f
--- a/Makefile
+++ b/Makefile
@@@ -50,7 -49,7 +50,7 @@@ install: all installma
  	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/share/monkeysphere
  	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
  	mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
--	install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh $(DESTDIR)$(PREFIX)/bin
++	install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
  	install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin
  	install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
  	install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
diff --cc man/man1/openpgp2ssh.1
index 89df047,89df047..8374a9f
--- a/man/man1/openpgp2ssh.1
+++ b/man/man1/openpgp2ssh.1
@@@ -90,6 -90,6 +90,7 @@@ only acts on keys associated with the f
  passed in.  If you send it more than one primary key, it will silently
  ignore later ones.
  .Sh SEE ALSO
++.Xr pem2openpgp 1 ,
  .Xr monkeysphere 1 ,
  .Xr monkeysphere 7 ,
  .Xr ssh 1 ,