[Slim-Checkins] r33806 - /7.7/trunk/buildme.pl

Author: mherger
Date: Wed Feb  1 05:05:55 2012
New Revision: 33806

URL: http://svn.slimdevices.com/slim?rev=33806&view=rev
Log:
Bug: n/a
Description: CPAN folder already exists, only move its content to the existing target folder

Modified:
    7.7/trunk/buildme.pl

Modified: 7.7/trunk/buildme.pl
URL: http://svn.slimdevices.com/slim/7.7/trunk/buildme.pl?rev=33806&r1=33805&r2=33806&view=diff
==============================================================================
--- 7.7/trunk/buildme.pl (original)
+++ 7.7/trunk/buildme.pl Wed Feb  1 05:05:55 2012
@@ -713,7 +713,7 @@
 	system("install -m0755 $buildDir/server/slimserver.pl $workDir/usr/sbin/squeezeboxserver && install -m0755 $buildDir/server/scanner.pl $workDir/usr/sbin/squeezeboxserver-scanner");
 
 	system("mv $buildDir/server/Slim $workDir/usr/share/perl5/");
-	system("mv $buildDir/server/CPAN $buildDir/server/lib $buildDir/server/Firmware $buildDir/server/Graphics $buildDir/server/HTML $share/");
+	system("mv $buildDir/server/CPAN/* $share/CPAN/; mv $buildDir/server/lib $buildDir/server/Firmware $buildDir/server/Graphics $buildDir/server/HTML $share/");
 	system("mv $buildDir/server/IR $buildDir/server/SQL $buildDir/server/strings.txt $buildDir/server/icudt46*.dat $buildDir/server/Bin $share/");
 	
 	system("mv $buildDir/server/*.conf $workDir/etc/squeezeboxserver");