From f39e56a84bd614238986e67fe47a62fa4de279d8 Mon Sep 17 00:00:00 2001 From: Jacob Meuser Date: Sun, 22 May 2005 23:58:58 +0000 Subject: [PATCH] ldconfig as config.mak variable patch by (Jacob Meuser: jakemsr, jakemsr com) Originally committed as revision 4303 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 3 +++ libavcodec/Makefile | 2 +- libavcodec/libpostproc/Makefile | 2 +- libavformat/Makefile | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 9a32150f88..b33b9e6cb1 100755 --- a/configure +++ b/configure @@ -197,6 +197,7 @@ ffserver="yes" ffplay="yes" LDFLAGS=-Wl,--warn-common FFSLDFLAGS=-Wl,-E +LDCONFIG="ldconfig" LIBPREF="lib" LIBSUF=".a" SLIBPREF="lib" @@ -273,6 +274,7 @@ dv1394="no" make="gmake" CFLAGS="$CFLAGS \$(PIC)" LDFLAGS="$LDFLAGS -export-dynamic -pthread" +LDCONFIG="ldconfig -m \$(libdir)" extralibs="$extralibs -lossaudio" ;; FreeBSD) @@ -1205,6 +1207,7 @@ fi echo "OPTFLAGS=$CFLAGS" >> config.mak echo "SHCFLAGS=$SHCFLAGS">>config.mak echo "LDFLAGS=$LDFLAGS" >> config.mak +echo "LDCONFIG=$LDCONFIG" >> config.mak echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak echo "BUILDSUF=$BUILDSUF" >> config.mak diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 41b05a88fd..a54cf348bc 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -465,7 +465,7 @@ else install -d $(libdir) install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so - ldconfig || true + $(LDCONFIG) || true endif ifeq ($(CONFIG_PP),yes) $(MAKE) -C libpostproc $@ diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile index 60d01df9a4..0f4147896c 100644 --- a/libavcodec/libpostproc/Makefile +++ b/libavcodec/libpostproc/Makefile @@ -61,7 +61,7 @@ else ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR) install -d $(libdir)/pkgconfig install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig - ldconfig || true + $(LDCONFIG) || true endif endif mkdir -p $(prefix)/include/postproc diff --git a/libavformat/Makefile b/libavformat/Makefile index 3b1b1437d4..795ba022d6 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -111,7 +111,7 @@ else install -d $(libdir) install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so - ldconfig || true + $(LDCONFIG) || true endif else install: