diff --git a/configure b/configure index 19dd58498d..87f90ba12c 100755 --- a/configure +++ b/configure @@ -468,6 +468,7 @@ _iwmmxt=auto _mtrr=auto _install=install _ranlib=ranlib +_ldconfig=ldconfig _cc=cc test "$CC" && _cc="$CC" _gcc_check=yes @@ -662,6 +663,10 @@ TMPS="$I/mplayer-conf-$RANDOM-$$.S" # 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 @@ CC = $_cc HOST_CC = $_host_cc AWK = $_awk RANLIB = $_ranlib +LDCONFIG = $_ldconfig INSTALL = $_install EXTRA_INC = $_inc_extra OPTFLAGS = $CFLAGS \$(EXTRA_INC) diff --git a/libdha/Makefile b/libdha/Makefile index 25d8504533..59106f073b 100644 --- a/libdha/Makefile +++ b/libdha/Makefile @@ -84,19 +84,11 @@ install: 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