* 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

diff --git a/src/appl/mailquery/ChangeLog b/src/appl/mailquery/ChangeLog
index dbcee8da36513158de4e7741303157ae892aaaba..40a9b9c0c620a5e54c0c1125241be1e7816ca0f8 100644 (file)
--- 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 0650d3eecaa89b79cd78923a60bd8ba53ac47912..2ca0e7d43e61e9bef641528202ae9c36006d5082 100644 (file)
--- 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 367353214d0e637339de0a6165ca1860856878c7..dbc21bb394532eadae63450ad024a41f0306b94a 100644 (file)
--- 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 2b4c8633a1f27e7ef62a76521f7cb4f3e1029f30..2e75c683a16b100fa3ade9775a05da34ff7bcb45 100644 (file)
--- 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"