From 0014a3b72899b75674e87a568bc1d6e44f710474 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Wed, 29 Apr 2015 21:48:39 +0100
Subject: [PATCH] Win & Mac package fixes.

---
 FlightGear.iss                | 2 +-
 hudson_mac_package_release.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/FlightGear.iss b/FlightGear.iss
index 32f5d7b..f1f9602 100755
--- a/FlightGear.iss
+++ b/FlightGear.iss
@@ -124,7 +124,7 @@ Source: "X:\data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdir
 Source: "X:\fgdata\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
 
 ; work-around for 3.4.1: look for additional aircraft data
-Source: "X:\aircraft-data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
+Source: "X:\extended-data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
 
 ; 32 bits install
 Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb
index 6bcf2d7..9eab1be 100755
--- a/hudson_mac_package_release.rb
+++ b/hudson_mac_package_release.rb
@@ -131,8 +131,8 @@ File.open("#{contents}/Info.plist", 'w') { |f|
 puts "Copying base package files into the image"
 `rsync -a --filter 'merge base-package.rules' fgdata/ #{resourcesDir}/data`
 
-# work-around for 3.4.1: copy aircraft files too
-`rsync -a aircraft-data/Aircraft #{resourcesDir}/data`
+# work-around for 3.4.1: copy aircraft/scenery files too
+`rsync -a aircraft-data/ #{resourcesDir}/data`
 
 # code sign the entire bundle once complete - v2 code-signing
 puts "Signing #{bundle}"