From ca7ec1c2af80a30a3ade543464b129a66bd6a4a1 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Tue, 5 Nov 2002 04:52:24 +0000 Subject: New Makefile variable RPATH_FLAG, possibly used even when we're not building shared libs. TCL_MAYBE_RPATH gets used to account for linking a shared tcl lib when we're not building shared libs. ticket: 1228 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14969 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/testing/util/ChangeLog | 4 ++++ src/kadmin/testing/util/Makefile.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/kadmin/testing') diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog index 72b0d4b44..9013928b9 100644 --- a/src/kadmin/testing/util/ChangeLog +++ b/src/kadmin/testing/util/ChangeLog @@ -1,3 +1,7 @@ +2002-11-04 Tom Yu + + * Makefile.in: Use $(TCL_MAYBE_RPATH). + 2002-08-29 Ken Raeburn * Makefile.in: Revert $(S)=>/ change, for Windows support. diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index 4c37226ff..6de033ac0 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -25,11 +25,11 @@ all-:: all-tcl:: $(CLNTPROG) $(SRVPROG) $(SRVPROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) - $(CC_LINK) -o $(SRVPROG) $(OBJS) \ + $(CC_LINK) -o $(SRVPROG) $(OBJS) $(TCL_MAYBE_RPATH) \ $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) $(TCL_LIBS) $(CLNTPROG): $(OBJS) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS) - $(CC_LINK) -o $(CLNTPROG) $(OBJS) \ + $(CC_LINK) -o $(CLNTPROG) $(OBJS) $(TCL_MAYBE_RPATH) \ $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS) $(TCL_LIBS) bsddb_dump: bsddb_dump.o -- cgit