diff options
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/zipdep.pl | 5 | ||||
| -rw-r--r-- | solenv/inc/_tg_zip.mk | 20 | ||||
| -rw-r--r-- | solenv/inc/tg_zip.mk | 2 |
3 files changed, 16 insertions, 11 deletions
diff --git a/solenv/bin/zipdep.pl b/solenv/bin/zipdep.pl index 33baac9b9f42..d20ee52d9c85 100755 --- a/solenv/bin/zipdep.pl +++ b/solenv/bin/zipdep.pl @@ -95,6 +95,11 @@ sub convert_slashes { my $path = shift; $path =~ s/\//\$\//g; $path =~ s/\\/\$\//g; + if ( $^O eq 'os2' ) + { + # remove also quotes surrounding name, thus writing buggy paths + $path =~ s/\"//g; + } return $path; }; diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk index 5c94da79354c..f243e4280034 100644 --- a/solenv/inc/_tg_zip.mk +++ b/solenv/inc/_tg_zip.mk @@ -8,7 +8,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELIF "$(GUI)"=="OS2" command_seperator=&& EQ=\\ -avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\" +avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELSE command_seperator=; EQ= @@ -137,7 +137,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELIF "$(GUI)"=="OS2" command_seperator=&& EQ=\\ -avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\" +avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELSE command_seperator=; EQ= @@ -266,7 +266,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELIF "$(GUI)"=="OS2" command_seperator=&& EQ=\\ -avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\" +avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELSE command_seperator=; EQ= @@ -395,7 +395,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELIF "$(GUI)"=="OS2" command_seperator=&& EQ=\\ -avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\" +avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELSE command_seperator=; EQ= @@ -524,7 +524,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELIF "$(GUI)"=="OS2" command_seperator=&& EQ=\\ -avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\" +avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELSE command_seperator=; EQ= @@ -653,7 +653,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELIF "$(GUI)"=="OS2" command_seperator=&& EQ=\\ -avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\" +avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELSE command_seperator=; EQ= @@ -782,7 +782,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELIF "$(GUI)"=="OS2" command_seperator=&& EQ=\\ -avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\" +avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELSE command_seperator=; EQ= @@ -911,7 +911,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELIF "$(GUI)"=="OS2" command_seperator=&& EQ=\\ -avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\" +avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELSE command_seperator=; EQ= @@ -1040,7 +1040,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELIF "$(GUI)"=="OS2" command_seperator=&& EQ=\\ -avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\" +avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELSE command_seperator=; EQ= @@ -1169,7 +1169,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELIF "$(GUI)"=="OS2" command_seperator=&& EQ=\\ -avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\" +avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELSE command_seperator=; EQ= diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk index 4646a172ca77..7321590b0a9d 100644 --- a/solenv/inc/tg_zip.mk +++ b/solenv/inc/tg_zip.mk @@ -32,7 +32,7 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELIF "$(GUI)"=="OS2" command_seperator=&& EQ=\\ -avoid_cvs_dir=-x \"*CVS*\" -x \"*.svn*\" +avoid_cvs_dir=-x "*CVS*" -x "*.svn*" .ELSE command_seperator=; EQ= |