From 3ec236cc26f132db81c41c442dfe70c8e00190fa Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Tue, 9 Aug 1994 21:35:23 +0000
Subject: [PATCH] 	* Makefile.in: 	* configure.in: make install fixes

	* poplib.c: Ultrix cpp doesn't like '#error'

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4099 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/mailquery/ChangeLog    | 5 +++++
 src/appl/mailquery/Makefile.in  | 4 ++--
 src/appl/mailquery/configure.in | 2 ++
 src/appl/mailquery/poplib.c     | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/appl/mailquery/ChangeLog b/src/appl/mailquery/ChangeLog
index dbcee8da3..40a9b9c0c 100644
--- a/src/appl/mailquery/ChangeLog
+++ b/src/appl/mailquery/ChangeLog
@@ -1,4 +1,9 @@
 Tue Aug  9 16:45:53 1994  Tom Yu  (tlyu@dragons-lair)
 
+	* Makefile.in:
+	* configure.in: make install fixes
+
+	* poplib.c: Ultrix cpp doesn't like '#error'
+
 	* Makefile.in: oops forgot about $(COMERRLIB)
 
diff --git a/src/appl/mailquery/Makefile.in b/src/appl/mailquery/Makefile.in
index 0650d3eec..2ca0e7d43 100644
--- a/src/appl/mailquery/Makefile.in
+++ b/src/appl/mailquery/Makefile.in
@@ -19,6 +19,6 @@ clean::
 	$(RM) mailquery.o poplib.o mailquery
 
 install::
-	cp mailquery ${DESTDIR}$(CLIENT_BINDIR)/mailquery
-	cp mailquery.M ${DESTDIR}$(CLIENT_MANDIR)/mailquery.1
+	$(INSTALL_PROGRAM) mailquery ${DESTDIR}$(CLIENT_BINDIR)/mailquery
+	$(INSTALL_DATA) mailquery.M ${DESTDIR}$(CLIENT_MANDIR)/mailquery.1
 
diff --git a/src/appl/mailquery/configure.in b/src/appl/mailquery/configure.in
index 367353214..dbc21bb39 100644
--- a/src/appl/mailquery/configure.in
+++ b/src/appl/mailquery/configure.in
@@ -1,6 +1,8 @@
 AC_INIT(mailquery.c)
 WITH_CCOPTS
 AC_SET_BUILDTOP
+AC_PROG_INSTALL
+WITH_KRB5ROOT
 CONFIG_RULES
 AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR))
 KRB_INCLUDE
diff --git a/src/appl/mailquery/poplib.c b/src/appl/mailquery/poplib.c
index 2b4c8633a..2e75c683a 100644
--- a/src/appl/mailquery/poplib.c
+++ b/src/appl/mailquery/poplib.c
@@ -29,7 +29,7 @@ static char rcsid[] = "@(#)$Header$";
 #include <netdb.h>
 #include <stdio.h>
 #if defined(KRB4) && defined(KRB5)
-# error You cannot define both KRB4 and KRB5
+error You cannot define both KRB4 and KRB5
 #endif
 #ifndef KPOP_SERVICE
 #define KPOP_SERVICE "kpop"
-- 
2.26.2