From 6488bad95968be79cae925b0fb1e183c9baf8984 Mon Sep 17 00:00:00 2001 From: Sander Mertens Date: Sun, 1 Nov 2015 12:14:14 -0500 Subject: [PATCH] #388 Fix issue with copying platform specific files --- build/artefact.rb | 2 +- build/library.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/artefact.rb b/build/artefact.rb index 211c16c1..4c37dac7 100644 --- a/build/artefact.rb +++ b/build/artefact.rb @@ -147,8 +147,8 @@ def corto_replace(str) if (not File.exists? lib) then abort "\033[1;31m[ #{l} not found ]\033[0;49m" end - lib end + lib end OBJECTS.concat(LINKED) diff --git a/build/library.rb b/build/library.rb index a6be95a2..b5da6988 100644 --- a/build/library.rb +++ b/build/library.rb @@ -52,11 +52,11 @@ etc = "#{ENV['CORTO_TARGET']}/etc/corto/#{VERSION}/#{TARGETPATH}" sh "mkdir -p #{etc}" if File.exists? "etc/everywhere" then - sh "cp -r etc/everywhere/ #{etc}/ 2> /dev/null" + sh "cp -r etc/everywhere/* #{etc}/" end platformStr = "etc/" + `uname -s`[0...-1] + "-" + `uname -p`[0...-1] if File.exists? platformStr then - sh "cp -r " + platformStr + "/ #{etc}" + sh "cp -r " + platformStr + "/* #{etc}" end end if ENV['CORTO_TARGET'] != "/usr/local" then