From 4739a43b5fb9397036eea218ff67e2163faa948b Mon Sep 17 00:00:00 2001 From: Volker Grabsch Date: Wed, 6 Jun 2012 12:41:28 +0300 Subject: fix install/uninstall static library in windows The problem is that libxine-1.def is not generated when building a static library, so it can't be installed or uninstalled. So the corresponding commands in Makefile.am should be allowed to fail. --- src/xine-engine/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 535be3557..b1c73a112 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -45,10 +45,10 @@ noinst_HEADERS = bswap.h ffmpeg_bswap.h xine_private.h if WIN32 install-exec-local: - cp -p $(DEF_FILE) $(DESTDIR)$(libdir) + -cp -p $(DEF_FILE) $(DESTDIR)$(libdir) uninstall-local: - rm -f $(DEF_FILE) + -rm -f $(DEF_FILE) endif $(XINEUTILS_LIB): -- cgit v1.2.3 From cd929724be459ab969e9c29d867c7a1a8c99ee0f Mon Sep 17 00:00:00 2001 From: Volker Grabsch Date: Wed, 6 Jun 2012 12:42:34 +0300 Subject: fix make uninstall for libxine-1.def "make uninstall" tries to remove the local "libxine-1.def" instead of the installed "/.../i686-pc-mingw32/lib/libxine-1.def". --- src/xine-engine/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index b1c73a112..cd8f83df0 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -48,7 +48,7 @@ install-exec-local: -cp -p $(DEF_FILE) $(DESTDIR)$(libdir) uninstall-local: - -rm -f $(DEF_FILE) + -rm -f $(DESTDIR)$(libdir)/$(DEF_FILE) endif $(XINEUTILS_LIB): -- cgit v1.2.3