diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-14 09:52:38 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-14 13:52:25 +0200 |
| commit | a63714e2819a48fee9bed670cd42aaf2d4755fce (patch) | |
| tree | 9f71e2ef122803c9fe51a01b5a8016e6c07215e0 | |
| parent | c29d73f75c9d58e9f2d870500941798ab0e5cd3b (diff) | |
drop extra complication
Change-Id: Ic26080af8496357fec063f833dc79701a83b9061
| -rwxr-xr-x | scp2/inc/macros.inc | 4 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/directory.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index d924d3eb30e9..34159c438842 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -127,7 +127,7 @@ #define STD_FONTWIN_FILE(id,name,fontname) \ File id \ TXT_FILE_BODY; \ - Dir = PREDEFINED_OSSYSTEMFONTDIR; \ + Dir = gid_Dir_Fonts_Truetype; \ Styles = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \ Name = STRING(name) ; \ FontName = STRING(fontname) ; \ @@ -148,7 +148,7 @@ #define STD_FONT_FILE(id,name,fontname) \ File id \ TXT_FILE_BODY; \ - Dir = PREDEFINED_OSSYSTEMFONTDIR; \ + Dir = gid_Dir_Fonts_Truetype; \ Styles = (PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \ Name = STRING(name) ; \ FontName = STRING(fontname) ; \ diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index 97b9937611bb..d6e79c7cd1ae 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -364,7 +364,7 @@ sub create_defaultdir_directorynames my $fontdefaultdir = ""; if ( $onedir->{'defaultdir'} ) { $fontdefaultdir = $onedir->{'defaultdir'}; } - if (( $fontdir eq "PREDEFINED_OSSYSTEMFONTDIR" ) && ( $fontdefaultdir eq $installer::globals::fontsdirhostname )) + if (( $fontdir eq $installer::globals::fontsdirhostname ) && ( $fontdefaultdir eq $installer::globals::fontsdirhostname )) { $installer::globals::fontsdirname = $onedir->{'defaultdir'}; $installer::globals::fontsdirparent = $onedir->{'uniqueparentname'}; |