summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/kadm/ChangeLog4
-rw-r--r--src/lib/kadm/Makefile.in6
-rw-r--r--src/lib/kadm/configure.in1
-rw-r--r--src/lib/krb4/ChangeLog5
-rw-r--r--src/lib/krb4/Makefile.in5
5 files changed, 13 insertions, 8 deletions
diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog
index bea0e7693..d8939ac92 100644
--- a/src/lib/kadm/ChangeLog
+++ b/src/lib/kadm/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 21 20:51:06 1996 Sam Hartman <hartmans@mit.edu>
+
+ * Makefile.in (check-unix): Use KRB5_RUN_FLAGS
+
Wed Mar 13 17:37:00 1996 Ken Raeburn <raeburn@cygnus.com>
* configure.in: Use AC_HEADER_STDARG.
diff --git a/src/lib/kadm/Makefile.in b/src/lib/kadm/Makefile.in
index 1a65a17d5..62cda2cc9 100644
--- a/src/lib/kadm/Makefile.in
+++ b/src/lib/kadm/Makefile.in
@@ -2,7 +2,7 @@ CFLAGS = $(CCOPTS) $(DEFS)
##DOSBUILDTOP = ..\..
##DOSLIBNAME=kadm.lib
-
+RUN_SETUP=@KRB5_RUN_ENV@
BASE_OBJS= adm_conn.$(OBJEXT) \
adm_kt_dec.$(OBJEXT) \
adm_kt_enc.$(OBJEXT) \
@@ -76,8 +76,8 @@ t_ktentry: $(T_KTENTRY_OBJS)
TEST_PROGS = t_dbentry t_ktentry
check-unix:: $(TEST_PROGS)
- ./t_dbentry -r 100
- ./t_ktentry -r 100
+ $(RUN_SETUP) ./t_dbentry -r 100
+ $(RUN_SETUP) ./t_ktentry -r 100
check-mac::
diff --git a/src/lib/kadm/configure.in b/src/lib/kadm/configure.in
index 5068e73ec..9eef7aa11 100644
--- a/src/lib/kadm/configure.in
+++ b/src/lib/kadm/configure.in
@@ -9,6 +9,7 @@ AC_HAVE_HEADERS(pwd.h syslog.h)
AC_HAVE_FUNCS(srand48 srand srandom syslog openlog closelog)
AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAVE_VSPRINTF))
ET_RULES
+KRB5_RUN_FLAGS
LinkFileDir(../libkadm.a, libkadm.a, ./kadm)
AppendRule([all-unix:: ../libkadm.a])
AppendRule([all:: all-$(WHAT)])
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 81b392247..7d6ea10de 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 22 07:41:15 1996 Sam Hartman <hartmans@mit.edu>
+
+ * Makefile.in (install-unix): Don't include an install rule, as it
+ is generated by aclocal.m4 for shared libs.
+
Tue Apr 30 19:26:11 1996 Ken Raeburn <raeburn@cygnus.com>
* configure.in: Evaluate AC_C_CROSS before AC_TRY_RUN, to clean up
diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in
index 3729c2182..ed213269f 100644
--- a/src/lib/krb4/Makefile.in
+++ b/src/lib/krb4/Makefile.in
@@ -270,11 +270,6 @@ clean-windows::
-$(RM) ..\..\floppy\kerberos.lib
-$(RM) ..\..\floppy\kerberos.dll
-install-unix::
- $(INSTALL_DATA) $(LIBNAME) $(DESTDIR)$(KRB5_LIBDIR)/$(LIBNAME)
- $(CHMOD) 644 $(DESTDIR)$(KRB5_LIBDIR)/$(LIBNAME)
- $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/$(LIBNAME)
- $(CHMOD) 444 $(DESTDIR)$(KRB5_LIBDIR)/$(LIBNAME)
check-unix:: $(TEST_PROGS)