aboutsummaryrefslogtreecommitdiff
path: root/src/kadmin/testing
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2002-11-05 04:52:24 +0000
committerTom Yu <tlyu@mit.edu>2002-11-05 04:52:24 +0000
commitca7ec1c2af80a30a3ade543464b129a66bd6a4a1 (patch)
tree223fc8058fd569869c8bf63d2f3a2c8648414b2c /src/kadmin/testing
parentcabc9a2753bf6a3e46c885f2ccbce5728709d8aa (diff)
downloadkrb5-ca7ec1c2af80a30a3ade543464b129a66bd6a4a1.zip
krb5-ca7ec1c2af80a30a3ade543464b129a66bd6a4a1.tar.gz
krb5-ca7ec1c2af80a30a3ade543464b129a66bd6a4a1.tar.bz2
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
Diffstat (limited to 'src/kadmin/testing')
-rw-r--r--src/kadmin/testing/util/ChangeLog4
-rw-r--r--src/kadmin/testing/util/Makefile.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index 72b0d4b..9013928 100644
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-04 Tom Yu <tlyu@mit.edu>
+
+ * Makefile.in: Use $(TCL_MAYBE_RPATH).
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* 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 4c37226..6de033a 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