summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2012-06-06 12:49:24 +0300
committerPetri Hintukainen <phintuka@users.sourceforge.net>2012-06-06 12:49:24 +0300
commit6a320680e080f23b9bd0e6d8208f61e91b4542f6 (patch)
tree77db158174ecf2fffb4fb3bed87822457a5df6e8 /src
parentb631217b97e6e63807a2e7195658d12de0236f58 (diff)
parentcd929724be459ab969e9c29d867c7a1a8c99ee0f (diff)
downloadxine-lib-6a320680e080f23b9bd0e6d8208f61e91b4542f6.tar.gz
xine-lib-6a320680e080f23b9bd0e6d8208f61e91b4542f6.tar.bz2
Merge from 1.1
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index f7a932096..6fc6890e6 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -69,8 +69,9 @@ $(YUV_LIB):
if WIN32
install-exec-local:
- cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
+ -cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
endif
uninstall-local:
- rm -f $(DEF_FILE) "$(DESTDIR)$(libdir)"/libxine-interface.la
+ rm -f "$(DESTDIR)$(libdir)"/libxine-interface.la
+ -rm -f $(DESTDIR)$(libdir)/$(DEF_FILE)