[MPlayer-cvslog] r21973 - in trunk: configure libdha/Makefile

[diego]

Author: diego
Date: Sat Jan 20 22:19:58 2007
New Revision: 21973

Modified:
   trunk/configure
   trunk/libdha/Makefile

Log:
Move ldconfig platform differences into configure where they belong.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sat Jan 20 22:19:58 2007
@@ -468,6 +468,7 @@
 _mtrr=auto
 _install=install
 _ranlib=ranlib
+_ldconfig=ldconfig
 _cc=cc
 test "$CC" && _cc="$CC"
 _gcc_check=yes
@@ -662,6 +663,10 @@
 # stuff explicitly as command line argument.  In other words: It would be
 # resonable to have only /usr/include or only /usr/local/include.
 
+if openbsd ; then
+  _ldconfig="ldconfig -R"
+fi
+
 if freebsd ; then
   _ld_extra="$_ld_extra -L/usr/local/lib"
   _inc_extra="$_inc_extra -I/usr/local/include"
@@ -7445,6 +7450,7 @@
 HOST_CC = $_host_cc
 AWK = $_awk
 RANLIB = $_ranlib
+LDCONFIG = $_ldconfig
 INSTALL = $_install
 EXTRA_INC = $_inc_extra
 OPTFLAGS = $CFLAGS \$(EXTRA_INC)

Modified: trunk/libdha/Makefile
==============================================================================
--- trunk/libdha/Makefile	(original)
+++ trunk/libdha/Makefile	Sat Jan 20 22:19:58 2007
@@ -84,19 +84,11 @@
 	install -m 755 $(INSTALLSTRIP) -p $(LIBNAME) $(LIBDIR)/$(LIBNAME)
 	rm -f $(LIBDIR)/libdha.so
 	ln -sf $(LIBNAME) $(LIBDIR)/$(SHORTNAME)
-ifeq ($(TARGET_OS),OpenBSD)
-	-ldconfig -R
-else
-	-ldconfig
-endif
+	-$(LDCONFIG)
 
 uninstall:
 	rm -f $(LIBDIR)/libdha.so $(LIBDIR)/$(SHORTNAME) $(LIBDIR)/$(LIBNAME)
-ifeq ($(TARGET_OS),OpenBSD)
-	-ldconfig -R
-else
-	-ldconfig
-endif
+	-$(LDCONFIG)
 
 ifneq ($(wildcard .depend),)
 include .depend