diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-01-19 18:44:57 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-01-19 18:44:57 +0000 |
| commit | 4c40a2de53cb618b839d1647442dcd9f0e9d2ae4 (patch) | |
| tree | 8cbf419a991e02ec4d3edfca216ecf5b4efec709 /src/lib/kadm5 | |
| parent | 7ad685d8ab901f3794b4a2a48b0d3a15fd4068ee (diff) | |
| download | krb5-4c40a2de53cb618b839d1647442dcd9f0e9d2ae4.zip krb5-4c40a2de53cb618b839d1647442dcd9f0e9d2ae4.tar.gz krb5-4c40a2de53cb618b839d1647442dcd9f0e9d2ae4.tar.bz2 | |
Change basename of libkadm5 libraries to avoid Heimdal conflict
ticket: 6644
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23662 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kadm5')
| -rw-r--r-- | src/lib/kadm5/clnt/Makefile.in | 7 | ||||
| -rw-r--r-- | src/lib/kadm5/clnt/libkadm5clnt_mit.exports (renamed from src/lib/kadm5/clnt/libkadm5clnt.exports) | 0 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/Makefile.in | 7 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/libkadm5srv_mit.exports (renamed from src/lib/kadm5/srv/libkadm5srv.exports) | 0 |
4 files changed, 12 insertions, 2 deletions
diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index aceb949..f6a11b4 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -3,7 +3,7 @@ BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5 DEFS= -LIBBASE=kadm5clnt +LIBBASE=kadm5clnt_mit LIBMAJOR=7 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST @@ -70,6 +70,11 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs install:: install-libs +install-unix:: + $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkadm5clnt$(DEPLIBEXT) + (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIBBASE)$(DEPLIBEXT) \ + libkadm5clnt$(DEPLIBEXT)) + depend:: includes @lib_frag@ diff --git a/src/lib/kadm5/clnt/libkadm5clnt.exports b/src/lib/kadm5/clnt/libkadm5clnt_mit.exports index 5e81580..5e81580 100644 --- a/src/lib/kadm5/clnt/libkadm5clnt.exports +++ b/src/lib/kadm5/clnt/libkadm5clnt_mit.exports diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index e813830..9e8b26f 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -9,7 +9,7 @@ DEFS= ##DOSBUILDTOP = ..\..\.. ##DOSLIBNAME = libkadm5srv.lib -LIBBASE=kadm5srv +LIBBASE=kadm5srv_mit LIBMAJOR=7 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST @@ -87,6 +87,11 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs install:: install-libs +install-unix:: + $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkadm5srv$(DEPLIBEXT) + (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIBBASE)$(DEPLIBEXT) \ + libkadm5srv$(DEPLIBEXT)) + depend:: includes @lib_frag@ diff --git a/src/lib/kadm5/srv/libkadm5srv.exports b/src/lib/kadm5/srv/libkadm5srv_mit.exports index d8d3b22..d8d3b22 100644 --- a/src/lib/kadm5/srv/libkadm5srv.exports +++ b/src/lib/kadm5/srv/libkadm5srv_mit.exports |