5 files changed, 10 insertions, 17 deletions
diff --git a/configure.pl b/configure.pl
index 53b7897e5..d94b376e2 100755
--- a/configure.pl
+++ b/configure.pl
@@ -1726,7 +1726,9 @@ sub get_os_info {
     $info{'name'} = $name;
 
     while($_ = &$reader()) {
-        match_any_of($_, \%info, 'quoted', 'realname', 'ar_command');
+        match_any_of($_, \%info,
+                     'quoted', 'realname', 'ar_command',
+                     'install_cmd_data', 'install_cmd_exec');
 
         match_any_of($_, \%info, 'unquoted',
                      'os_type',
@@ -1736,9 +1738,7 @@ sub get_os_info {
                      'install_root',
                      'header_dir',
                      'lib_dir', 'doc_dir',
-                     'ar_needs_ranlib',
-                     'install_cmd_data',
-                     'install_cmd_exec');
+                     'ar_needs_ranlib');
 
         read_list($_, $reader, 'aliases', list_push(\@{$info{'aliases'}}));
 
diff --git a/src/build-data/os/darwin b/src/build-data/os/darwin
index aa28dc59b..298621216 100644
--- a/src/build-data/os/darwin
+++ b/src/build-data/os/darwin
@@ -14,13 +14,6 @@ doc_dir doc
 all
 </supports_shared>
 
-<arch>
-ia32
-amd64
-ppc
-ppc64 # g5!
-</arch>
-
 <aliases>
 macosx
 </aliases>
diff --git a/src/build-data/os/defaults b/src/build-data/os/defaults
index 88fd82252..5648643a9 100644
--- a/src/build-data/os/defaults
+++ b/src/build-data/os/defaults
@@ -15,5 +15,5 @@ header_dir include
 lib_dir lib
 doc_dir share/doc
 
-install_cmd_data install -m 644
-install_cmd_exec install -m 755
+install_cmd_data "install -m 644"
+install_cmd_exec "install -m 755"
diff --git a/src/build-data/os/mingw b/src/build-data/os/mingw
index 8c41fbc21..eb25017fc 100644
--- a/src/build-data/os/mingw
+++ b/src/build-data/os/mingw
@@ -13,8 +13,8 @@ header_dir include
 lib_dir lib
 doc_dir share/doc
 
-install_cmd_data install -m 644
-install_cmd_exec install -m 755
+install_cmd_data "install -m 644"
+install_cmd_exec "install -m 755"
 
 <aliases>
 msys
diff --git a/src/build-data/os/windows b/src/build-data/os/windows
index 823c60d6c..a04d609b8 100644
--- a/src/build-data/os/windows
+++ b/src/build-data/os/windows
@@ -9,8 +9,8 @@ static_suffix lib
 install_root c:\Botan
 doc_dir docs
 
-install_cmd_data copy
-install_cmd_exec copy
+install_cmd_data "copy"
+install_cmd_exec "copy"
 
 <target_features>
 win32_virtual_lock