diff options
| author | James O'Gorman <james@netinertia.co.uk> | 2011-05-02 13:17:45 +0000 |
|---|---|---|
| committer | James O'Gorman <james@netinertia.co.uk> | 2011-05-02 13:17:45 +0000 |
| commit | 6297e8568d810ed2062cb716dc25992db694aabe (patch) | |
| tree | 478798151f8089006b026c4a20918fb058ebcac6 /infrastructure/makeparcels.pl.in | |
| parent | e10e0258106df1d93e60b046c9ef51770d8997fd (diff) | |
Use /usr/ucb/install on Solaris as /usr/sbin/install has some odd behaviour.
Diffstat (limited to 'infrastructure/makeparcels.pl.in')
| -rwxr-xr-x | infrastructure/makeparcels.pl.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/infrastructure/makeparcels.pl.in b/infrastructure/makeparcels.pl.in index 30d28d40..bd6efe18 100755 --- a/infrastructure/makeparcels.pl.in +++ b/infrastructure/makeparcels.pl.in @@ -137,6 +137,9 @@ for my $parcel (@parcels) my $dir = BoxPlatform::parcel_dir($parcel); my @parcel_deps; + # Need to use BSD install on Solaris + my $install_bin = $build_os eq 'SunOS' ? '/usr/ucb/install' : 'install'; + unless ($target_windows) { open SCRIPT,">parcels/scripts/install-$parcel" or die @@ -327,7 +330,7 @@ EOF } print SCRIPT "mkdir -p " . "\${DESTDIR}$local_install_dir/\n"; - print SCRIPT "install $name " . + print SCRIPT "$install_bin $name " . "\${DESTDIR}$local_install_dir\n"; } } |