From 55566268b29526888826774c25bbfa6ea0cbb051 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 28 Aug 2006 10:20:50 +0000 Subject: [PATCH] INTEGRATION: CWS socsprod_SRC680 (1.64.68); FILE MERGED 2006/08/15 15:54:43 abi 1.64.68.3: RESYNC: (1.64-1.67); FILE MERGED 2006/07/06 16:25:49 is 1.64.68.2: #137700# pdf converter detects office 2006/07/04 14:46:35 is 1.64.68.1: #137700# pdf converter product --- solenv/bin/make_installer.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 9e0db9bf99e7..3a9827dadcff 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -4,9 +4,9 @@ # # $RCSfile: make_installer.pl,v $ # -# $Revision: 1.67 $ +# $Revision: 1.68 $ # -# last change: $Author: kz $ $Date: 2006-07-19 09:52:50 $ +# last change: $Author: ihi $ $Date: 2006-08-28 11:20:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -668,7 +668,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10c.log", $filesinproductlanguageresolvedarrayref); } } - if ( ! $installer::globals::islanguagepackinunixmulti ) + + if (( ! $installer::globals::islanguagepackinunixmulti ) && ( ! $allvariableshashref->{'NO_README_IN_ROOTDIR'} )) { $filesinproductlanguageresolvedarrayref = installer::scriptitems::add_License_Files_into_Installdir($filesinproductlanguageresolvedarrayref, $languagesarrayref); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10b.log", $filesinproductlanguageresolvedarrayref); } @@ -1735,7 +1736,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # setting patch codes to detect installed products - if (( $installer::globals::patch ) || ( $installer::globals::languagepack )) { installer::windows::patch::update_patch_tables($languageidtdir, $allvariableshashref); } + if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $allvariableshashref->{'PDFCONVERTER'} )) { installer::windows::patch::update_patch_tables($languageidtdir, $allvariableshashref); } # Adding Windows Installer CustomActions