changes to fix make install

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3917 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 39 insertions, 4 deletions

diff --git a/src/appl/sample/configure.in b/src/appl/sample/configure.in
index 3d953e69f..5f1ad6f90 100644
--- a/src/appl/sample/configure.in
+++ b/src/appl/sample/configure.in
@@ -4,5 +4,6 @@ AC_SET_BUILDTOP
 CONFIG_DIRS(sclient sserver)
 MAKE_SUBDIRS("making",all)
 MAKE_SUBDIRS("cleaning",clean)
+MAKE_SUBDIRS("installing",install)
 CONFIG_RULES
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index d53e8322e..6011e9919 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -6,10 +6,26 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT = @KRB5ROOT@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
+KRB5MANROOT = $(KRB5ROOT)/man
+ADMIN_BINDIR = $(KRB5ROOT)/admin
+SERVER_BINDIR = $(KRB5ROOT)/sbin
+CLIENT_BINDIR = $(KRB5ROOT)/bin
+ADMIN_MANDIR = $(KRB5MANROOT)/man8
+SERVER_MANDIR = $(KRB5MANROOT)/man8
+CLIENT_MANDIR = $(KRB5MANROOT)/man1
+FILE_MANDIR = $(KRB5MANROOT)/man5
+KRB5_LIBDIR = $(KRB5ROOT)/lib
+KRB5_INCDIR = $(KRB5ROOT)/include
+KRB5_INCSUBDIRS = \
+	$(KRB5_INCDIR)/krb5 \
+	$(KRB5_INCDIR)/asn.1 \
+	$(KRB5_INCDIR)/kerberosIV
+
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
 ISODELIB=$(TOPLIBD)/libisode.a
@@ -32,5 +48,5 @@ clean::
 	$(RM) sclient.o sclient
 
 install::
-	$(INSTALLPROG) sclient ${DESTDIR}$(CLIENT_BINDIR)/sclient
-	$(INSTALLPROG) sclient.M ${DESTDIR}$(CLIENT_MANDIR)/sclient.$(CLIENT_MANSUFFIX)
+	cp sclient ${DESTDIR}$(CLIENT_BINDIR)/sclient
+	cp sclient.M ${DESTDIR}$(CLIENT_MANDIR)/sclient.1
diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in
index 8650da601..4632b9f26 100644
--- a/src/appl/sample/sclient/configure.in
+++ b/src/appl/sample/sclient/configure.in
@@ -6,4 +6,5 @@ AC_HAVE_LIBRARY(nsl)
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index bc13541fe..8c3a0585b 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -6,10 +6,26 @@ DEFS = @DEFS@
 CC = @CC@
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
+KRB5ROOT = @KRB5ROOT@
  
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
+KRB5MANROOT = $(KRB5ROOT)/man
+ADMIN_BINDIR = $(KRB5ROOT)/admin
+SERVER_BINDIR = $(KRB5ROOT)/sbin
+CLIENT_BINDIR = $(KRB5ROOT)/bin
+ADMIN_MANDIR = $(KRB5MANROOT)/man8
+SERVER_MANDIR = $(KRB5MANROOT)/man8
+CLIENT_MANDIR = $(KRB5MANROOT)/man1
+FILE_MANDIR = $(KRB5MANROOT)/man5
+KRB5_LIBDIR = $(KRB5ROOT)/lib
+KRB5_INCDIR = $(KRB5ROOT)/include
+KRB5_INCSUBDIRS = \
+	$(KRB5_INCDIR)/krb5 \
+	$(KRB5_INCDIR)/asn.1 \
+	$(KRB5_INCDIR)/kerberosIV
+
 SRCTOP = $(srcdir)/$(BUILDTOP)
 TOPLIBD = $(BUILDTOP)/lib
 ISODELIB=$(TOPLIBD)/libisode.a
@@ -32,5 +48,5 @@ clean::
 	$(RM) sserver.o sserver
 
 install::
-	$(INSTALLPROG) sserver ${DESTDIR}$(SERVER_BINDIR)/sserver
-	$(INSTALLPROG) sserver.M ${DESTDIR}$(SERVER_MANDIR)/sserver.$(SERVER_MANSUFFIX)
+	cp sserver ${DESTDIR}$(SERVER_BINDIR)/sserver
+	cp sserver.M ${DESTDIR}$(SERVER_MANDIR)/sserver.8
diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in
index c11045cc9..348a4aeaf 100644
--- a/src/appl/sample/sserver/configure.in
+++ b/src/appl/sample/sserver/configure.in
@@ -6,4 +6,5 @@ AC_HAVE_LIBRARY(nsl)
 CONFIG_RULES
 KRB_INCLUDE
 ISODE_INCLUDE
+WITH_KRB5ROOT
 AC_OUTPUT(Makefile,[EXTRA_RULES])