svn commit: samba r14661 - in branches/SAMBA_4_0/source: . script

jelmer at samba.org jelmer at samba.org
Wed Mar 22 20:42:34 GMT 2006


Author: jelmer
Date: 2006-03-22 20:42:33 +0000 (Wed, 22 Mar 2006)
New Revision: 14661

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14661

Log:
Install symlinks for shared libraries

Modified:
   branches/SAMBA_4_0/source/main.mk
   branches/SAMBA_4_0/source/script/installlib.sh


Changeset:
Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-03-22 20:41:54 UTC (rev 14660)
+++ branches/SAMBA_4_0/source/main.mk	2006-03-22 20:42:33 UTC (rev 14661)
@@ -128,8 +128,8 @@
 		$(BIN_PROGS)
 
 installlib: $(INSTALLABLE_SHARED_LIBS) $(STATIC_LIBS) installdirs
-	@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) $(INSTALLABLE_SHARED_LIBS) 
-	@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) $(STATIC_LIBS)
+	@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) "$(SHLIBEXT)" $(INSTALLABLE_SHARED_LIBS) 
+	@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) "$(STLIBEXT)" $(STATIC_LIBS)
 
 installheader: headers installdirs
 	@$(PERL) $(srcdir)/script/installheader.pl $(DESTDIR)$(INCLUDEDIR) $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)

Modified: branches/SAMBA_4_0/source/script/installlib.sh
===================================================================
--- branches/SAMBA_4_0/source/script/installlib.sh	2006-03-22 20:41:54 UTC (rev 14660)
+++ branches/SAMBA_4_0/source/script/installlib.sh	2006-03-22 20:42:33 UTC (rev 14661)
@@ -1,17 +1,21 @@
 #!/bin/sh
 
 LIBDIR=$1
+SHLIBEXT=$2
 
 shift
+shift
 
 for p in $*; do
  p2=`basename $p`
+ lnname=`echo $p2 | sed -e "s/\.$SHLIBEXT.*/.$SHLIBEXT/"`
  echo Installing $p as $LIBDIR/$p2
  if [ -f $LIBDIR/$p2 ]; then
    rm -f $LIBDIR/$p2.old
    mv $LIBDIR/$p2 $LIBDIR/$p2.old
  fi
  cp $p $LIBDIR/
+ ln -sf $p2 $LIBDIR/$lnname
 done
 
 cat << EOF



More information about the samba-cvs mailing list