svn rev #25150: trunk/src/config/

ghudson@MIT.EDU ghudson at MIT.EDU
Sun Sep 4 23:13:07 EDT 2011


http://src.mit.edu/fisheye/changelog/krb5/?cs=25150
Commit By: ghudson
Log Message:
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.



Changed Files:
U   trunk/src/config/lib.in
U   trunk/src/config/pre.in
Modified: trunk/src/config/lib.in
===================================================================
--- trunk/src/config/lib.in	2011-09-05 01:58:53 UTC (rev 25149)
+++ trunk/src/config/lib.in	2011-09-05 03:13:07 UTC (rev 25150)
@@ -103,16 +103,18 @@
 
 $(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) .)

Modified: trunk/src/config/pre.in
===================================================================
--- trunk/src/config/pre.in	2011-09-05 01:58:53 UTC (rev 25149)
+++ trunk/src/config/pre.in	2011-09-05 03:13:07 UTC (rev 25150)
@@ -262,11 +262,11 @@
 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@




More information about the cvs-krb5 mailing list