Use KRB5_RUN_FLAGS

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

diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog
index bea0e7693628a6c26134bd20bbe89e4b3260f618..d8939ac92dd823cc8236a200f48bffb348ab128c 100644 (file)
--- 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 1a65a17d55ce61ca2df18656b9dae3c8ee47db41..62cda2cc99384d4fad3f22a671c369c7f8549919 100644 (file)
--- 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 5068e73ecc23a2dcd47f40653ff9cadfaf1d600b..9eef7aa11100369a9c2753c9dddefeb6c132e532 100644 (file)
--- 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 81b392247bc975f544becd13d3e3234c5516a6fe..7d6ea10de7095f944f20aa91ae6e7ce835c4ef64 100644 (file)
--- 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 3729c2182fb5c92dad53901330ed268e7fd0e787..ed213269f48789b80accbabc0b0765e2ae3761a0 100644 (file)
--- 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)