diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-09-05 03:13:07 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-09-05 03:13:07 +0000 |
| commit | 24311fa2b4b95597695560144313debe0211e968 (patch) | |
| tree | a84da0ecfdc57921ccbd4556c08ecef1d5551593 | |
| parent | d4df2732e91514cd33ab850f945b57d352a7cc81 (diff) | |
| download | krb5-24311fa2b4b95597695560144313debe0211e968.tar.gz krb5-24311fa2b4b95597695560144313debe0211e968.tar.xz krb5-24311fa2b4b95597695560144313debe0211e968.zip | |
Use hard links for LIBLINKS
verto uses dladdr() to figure out where it should look for modules,
and dladdr may or may not follow symlinks. Hard links ensure that it
always looks in the directory where liblinks are, allowing it to find
the verto-k5ev module.
Make symlinks within the lib directory for .so and .so.X instead of
symlinking those back to the library build directory.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25150 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/config/lib.in | 10 | ||||
| -rw-r--r-- | src/config/pre.in | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/config/lib.in b/src/config/lib.in index 46727fe0a..871d3c483 100644 --- a/src/config/lib.in +++ b/src/config/lib.in @@ -103,16 +103,18 @@ lib$(LIBBASE)$(PFLIBEXT): $(PFOBJLISTS) $(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT): lib$(LIBBASE)$(STLIBEXT) $(RM) $@ - (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(STLIBEXT) .) + (cd $(TOPLIBD) && $(LN) $(RELDIR)/lib$(LIBBASE)$(STLIBEXT) .) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT): lib$(LIBBASE)$(SHLIBEXT) $(RM) $@ - (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBEXT) .) + (cd $(TOPLIBD) && \ + $(LN_S) lib$(LIBBASE)$(SHLIBVEXT) lib$(LIBBASE)$(SHLIBEXT)) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT): lib$(LIBBASE)$(SHLIBSEXT) $(RM) $@ - (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBSEXT) .) + (cd $(TOPLIBD) && \ + $(LN_S) lib$(LIBBASE)$(SHLIBVEXT) lib$(LIBBASE)$(SHLIBSEXT)) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT): lib$(LIBBASE)$(SHLIBVEXT) $(RM) $@ - (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBVEXT) .) + (cd $(TOPLIBD) && $(LN) $(RELDIR)/lib$(LIBBASE)$(SHLIBVEXT) .) $(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT): lib$(LIBBASE)$(PFLIBEXT) $(RM) $@ (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(PFLIBEXT) .) diff --git a/src/config/pre.in b/src/config/pre.in index 1ec893725..74204facf 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -262,11 +262,11 @@ transform = @program_transform_name@ RM = rm -f CP = cp MV = mv -f +LN = ln CHMOD=chmod RANLIB = @RANLIB@ ARCHIVE = @ARCHIVE@ ARADD = @ARADD@ -LN = @LN_S@ AWK = @AWK@ LEX = @LEX@ LEXLIB = @LEXLIB@ |