Skip to content

C
core
Kaydet (Commit) 7b4394f3 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

...but remove obsolete prereg-specific code again 

Change-Id: I98b20e2ef7f0ec8f609464980398ca09847b40e9
üst 51b0ada7
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
solenv/bin/modules/installer/simplepackage.pm
Dosyayı görüntüle @ 7b4394f3
...@@ -71,9 +71,8 @@ sub get_extensions_dir ...@@ -71,9 +71,8 @@ sub get_extensions_dir
my $extensiondir = $subfolderdir . $installer::globals::separator; my $extensiondir = $subfolderdir . $installer::globals::separator;
if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; } if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; }
my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions"; my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions";
my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg" . $installer::globals::separator . "bundled";
return ( $extensionsdir, $preregdir ); return $extensionsdir;
} }
################################################################## ##################################################################
...@@ -671,7 +670,7 @@ sub create_simple_package ...@@ -671,7 +670,7 @@ sub create_simple_package
installer::logger::print_message( "... removing superfluous directories ...\n" ); installer::logger::print_message( "... removing superfluous directories ...\n" );
installer::logger::include_header_into_logfile("Removing superfluous directories:"); installer::logger::include_header_into_logfile("Removing superfluous directories:");
my ( $extensionfolder, $preregdir ) = get_extensions_dir($subfolderdir); my $extensionfolder = get_extensions_dir($subfolderdir);
installer::systemactions::remove_empty_dirs_in_folder($extensionfolder); installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
if ( $installer::globals::compiler =~ /^unxmacx/ ) if ( $installer::globals::compiler =~ /^unxmacx/ )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment