summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Yeo <daveryeo@telus.net>2007-10-17 13:48:47 +0000
committerDiego Biurrun <diego@biurrun.de>2007-10-17 13:48:47 +0000
commit5b5d0491b5ca5896298337d0a4e6566d51a407b7 (patch)
tree6ac2ce67e1c47ee99cdef6966635303552eed2f3
parentab54bff20a800ce84b541cf45a660518aba248f3 (diff)
downloadffmpeg-5b5d0491b5ca5896298337d0a4e6566d51a407b7.tar.gz
Add SLIB_UNINSTALL_EXTRA_COMMAND to uninstall the things installed via
SLIB_INSTALL_EXTRA_COMMAND. patch by Dave Yeo, daveryeo telus net Originally committed as revision 10767 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--common.mak1
-rwxr-xr-xconfigure1
2 files changed, 2 insertions, 0 deletions
diff --git a/common.mak b/common.mak
index a3940730a7..e93ded0564 100644
--- a/common.mak
+++ b/common.mak
@@ -96,6 +96,7 @@ uninstall-libs:
-rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
"$(SHLIBDIR)/$(SLIBNAME)" \
"$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+ -$(SLIB_UNINSTALL_EXTRA_CMD)
-rm -f "$(LIBDIR)/$(LIB)"
uninstall-headers::
diff --git a/configure b/configure
index e575b054ad..79f1832f96 100755
--- a/configure
+++ b/configure
@@ -1909,6 +1909,7 @@ if enabled shared; then
echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak
echo "SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}" >> config.mak
echo "SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}" >> config.mak
+ echo "SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}" >> config.mak
fi
echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak
echo "EXTRALIBS=$extralibs" >> config.mak