From 227034f8e6f53360a29385e4577c58af050fa675 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 8 Jan 2006 16:14:12 +0100
Subject: Fixed the "plugins-clean" and "plugins-install" targets in the
 Makefile

---
 CONTRIBUTORS | 1 +
 HISTORY      | 2 ++
 Makefile     | 8 ++++----
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d0e75e83..d85f4aa3 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -855,6 +855,7 @@ Andreas Brachold <vdr04@deltab.de>
  for reporting that there are empty info.vdr files created if there is no EPG
  info available
  for implementing the SVDRP command MOVC
+ for fixing the "plugins-clean" and "plugins-install" targets in the Makefile
 
 Manuel Hartl <icecep@gmx.net>
  for suggesting to extend the logging info when starting/stopping timers
diff --git a/HISTORY b/HISTORY
index 63decbdf..12a35698 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4141,3 +4141,5 @@ Video Disk Recorder Revision History
   of the timers listed with their unique channel ids instead of their numbers
   (suggested by Matthias Schniedermeyer).
 - Added a missing #include <linux/unistd.h> to thread.c (thanks to Ville Skyttä).
+- Fixed the "plugins-clean" and "plugins-install" targets in the Makefile (thanks
+  to Andreas Brachold).
diff --git a/Makefile b/Makefile
index 8df6d7f1..74814905 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.81 2006/01/01 15:12:05 kls Exp $
+# $Id: Makefile 1.82 2006/01/08 16:12:26 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -192,7 +192,7 @@ plugins: include-dir
 
 plugins-clean:
 	@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
-	@-rm -f $(PLUGINLIBDIR)/libvdr-*.so.$(VDRVERSION)
+	@-rm -f $(PLUGINDIR)/lib/libvdr-*.so.$(VDRVERSION)
 
 # Install the files:
 
@@ -209,8 +209,8 @@ install:
             fi
 
 plugins-install:
-	@mkdir -p $(BINDIR)/$(PLUGINLIBDIR)
-	@cp $(PLUGINLIBDIR)/* $(BINDIR)/$(PLUGINLIBDIR)
+	@mkdir -p $(PLUGINLIBDIR)
+	@cp $(PLUGINDIR)/lib/libvdr-*.so.$(VDRVERSION) $(PLUGINLIBDIR)
 
 # Source documentation:
 
-- 
cgit v1.2.3