The 'plugins' target of the VDR Makefile now also copies files matching the wildcard "lib$$i-*.so" (previously only "libvdr-*.so") and also descends into subdirectories of the plugin source

2 files changed, 5 insertions, 2 deletions

diff --git a/HISTORY b/HISTORY
index cd04deb7..95a4ebad 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7737,3 +7737,6 @@ Video Disk Recorder Revision History
 - Updated the Polish OSD texts (thanks to Marek Nazarko).
 - Fixed using PATH_MAX and NAME_MAX (+/-1 because the first one includes the
   terminating 0, while the latter doesn't).
+- The 'plugins' target of the VDR Makefile now also copies files matching the wildcard
+  "lib$$i-*.so" (previously only "libvdr-*.so") and also descends into subdirectories
+  of the plugin source.
diff --git a/Makefile b/Makefile
index 913173b8..d24d08fd 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 2.53 2013/02/24 10:40:23 kls Exp $
+# $Id: Makefile 2.54 2013/03/11 15:01:01 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -220,7 +220,7 @@ plugins: include-dir vdr.pc
 	    INCLUDES="-I$(CWD)/include"\
 	    $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR="$(CWD)" || failed="$$failed $$i";\
 	    if [ -n "$(LCLBLD)" ] ; then\
-	       (cd $(PLUGINDIR)/src/$$i; for l in libvdr-*.so; do install $$l $(LIBDIR)/$$l.$(APIVERSION); done);\
+	       (cd $(PLUGINDIR)/src/$$i; for l in `find -name 'libvdr-*.so' -o -name 'lib$$i-*.so'`; do install $$l $(LIBDIR)/`basename $$l`.$(APIVERSION); done);\
 	       if [ -d $(PLUGINDIR)/src/$$i/po ]; then\
 	          for l in `ls $(PLUGINDIR)/src/$$i/po/*.mo`; do\
 	              install -D -m644 $$l $(LOCDIR)/`basename $$l | cut -d. -f1`/LC_MESSAGES/vdr-$$i.mo;\