diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-19 21:05:59 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-19 21:10:39 +0200 |
| commit | c7e3f88b1291c35e09d08d14f82eadf60f7063cd (patch) | |
| tree | 3c21cf1549a0cd0ca532451c4a320e1ac212c353 /solenv/bin/modules | |
| parent | 8ab3715d8e622d06cfaa404842de2d9f8ea66ef5 (diff) | |
Fix Mac build fallout from PRODUCTEXTENSION change
PRODUCTEXTENSION used to be empty. (No idea for how long it had been
empty.) And apparently some of the "installer" Perl code implicitly
assumed PRODUCTEXTENSION was empty. At least, producing the langpack
dmg for Mac started to fail when PRODUCTEXTENSION was no longer empty.
Diffstat (limited to 'solenv/bin/modules')
| -rwxr-xr-x | solenv/bin/modules/installer/simplepackage.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index c9ce580c5b9c..55e65bdc94b8 100755 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -278,13 +278,11 @@ sub create_package $folder = $packagename; } - # my $volume_name = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'}; # Adding PRODUCTVERSION makes this difficult to maintain! my $volume_name = $allvariables->{'PRODUCTNAME'}; my $volume_name_classic = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'}; my $volume_name_classic_app = $volume_name; # "app" should not contain version number - # $volume_name = $volume_name . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'}; # Adding PRODUCTEXTENSION makes this difficult to maintain! - $volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'}; - $volume_name_classic_app = $volume_name_classic_app . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'}; + $volume_name_classic = $volume_name_classic; + $volume_name_classic_app = $volume_name_classic_app; if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) { $volume_name = $volume_name . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'}; $volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'}; |