[FFmpeg-cvslog] build: Fix some paths in uninstall-libs

jamal git at videolan.org
Fri Sep 14 14:41:45 CEST 2012


ffmpeg | branch: release/0.9 | jamal <jamrial at gmail.com> | Fri Aug  3 17:13:27 2012 -0300| [e9aeab39098936f53cc955c8175bb7ade504fb8d] | committer: Michael Niedermayer

build: Fix some paths in uninstall-libs

Folder and file names weren't being separated with a slash.
This resulted in .dll.a, .lib and .def files not being removed on uninstall.

Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
(cherry picked from commit 49440853d0c1e740daee0e2df1e65d5e67b1ad6b)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9aeab39098936f53cc955c8175bb7ade504fb8d
---

 subdir.mak |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subdir.mak b/subdir.mak
index 3589dfb..84d92e7 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -84,8 +84,8 @@ uninstall-libs::
 	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
 	       "$(SHLIBDIR)/$(SLIBNAME)"            \
 	       "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-	-$(RM) $(SLIB_INSTALL_EXTRA_SHLIB:%="$(SHLIBDIR)"%)
-	-$(RM) $(SLIB_INSTALL_EXTRA_LIB:%="$(LIBDIR)"%)
+	-$(RM)  $(SLIB_INSTALL_EXTRA_SHLIB:%="$(SHLIBDIR)/%")
+	-$(RM)  $(SLIB_INSTALL_EXTRA_LIB:%="$(LIBDIR)/%")
 	-$(RM) "$(LIBDIR)/$(LIBNAME)"
 
 uninstall-headers::



More information about the ffmpeg-cvslog mailing list