Mercurial > mplayer.hg
changeset 21955:c24e237516f6
Move ldconfig platform differences into configure where they belong.
| author | diego |
|---|---|
| date | Sat, 20 Jan 2007 21:19:58 +0000 |
| parents | ad465ec1294a |
| children | 1344492230fc |
| files | configure libdha/Makefile |
| diffstat | 2 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Jan 20 21:14:14 2007 +0000 +++ b/configure Sat Jan 20 21:19:58 2007 +0000 @@ -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)
--- a/libdha/Makefile Sat Jan 20 21:14:14 2007 +0000 +++ b/libdha/Makefile Sat Jan 20 21:19:58 2007 +0000 @@ -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