aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamal <jamrial@gmail.com>2012-08-03 17:13:27 -0300
committerMichael Niedermayer <michaelni@gmx.at>2012-09-14 14:19:46 +0200
commite9aeab39098936f53cc955c8175bb7ade504fb8d (patch)
tree671a349fd7d6893b51c75c2642edd8dc3ddb7ad0
parentf7d7b01e81ff17c196b809a60368eb346cf6091b (diff)
downloadffmpeg-e9aeab39098936f53cc955c8175bb7ade504fb8d.tar.gz
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@gmx.net> (cherry picked from commit 49440853d0c1e740daee0e2df1e65d5e67b1ad6b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--subdir.mak4
1 files changed, 2 insertions, 2 deletions
diff --git a/subdir.mak b/subdir.mak
index 3589dfb7d6..84d92e7c60 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::