--- loncom/build/lpml_parse.pl 2001/11/17 18:35:21 1.19 +++ loncom/build/lpml_parse.pl 2001/11/17 21:30:28 1.20 @@ -8,7 +8,7 @@ # 9/17,9/18 - Scott Harrison # 11/4,11/5,11/6,11/7,11/16 - Scott Harrison # -# $Id: lpml_parse.pl,v 1.19 2001/11/17 18:35:21 harris41 Exp $ +# $Id: lpml_parse.pl,v 1.20 2001/11/17 21:30:28 harris41 Exp $ ### ############################################################################### @@ -823,7 +823,11 @@ END elsif ($mode eq 'configinstall' && $categoryname eq 'conf') { push @configall,$targetroot.'/'.$target; return $targetroot.'/'.$target.': alwaysrun'."\n". - "\t".'@echo -n ""; ECODE=0 && { perl filecompare.pl -b4 '.$sourceroot.'/'.$source.' '.$targetroot.'/'.$target.' || ECODE=$$?; } && { [ $$ECODE != "2" ] || (install '.$categoryhash{$categoryname}.' '. + "\t".'@echo -n ""; ECODE=0 && { perl filecompare.pl -b4 '. + $sourceroot.'/'.$source.' '.$targetroot.'/'.$target. + ' || ECODE=$$?; } && '. + '{ [ $$ECODE != "2" ] || (install '. + $categoryhash{$categoryname}.' '. $sourceroot.'/'.$source.' '. $targetroot.'/'.$target.'.lpmlnewconf'. ' && echo "**** NOTE: CONFIGURATION FILE CHANGE ****"'. @@ -831,6 +835,22 @@ END 'You likely need to compare contents of '. ''.$targetroot.'/'.$target.' with the new '. ''.$targetroot.'/'.$target.'.lpmlnewconf"'. + "$logcmd); } && ". + '{ [ $$ECODE != "3" ] || (install '. + $categoryhash{$categoryname}.' '. + $sourceroot.'/'.$source.' '. + $targetroot.'/'.$target.''. + ' && echo "**** WARNING: NEW CONFIGURATION FILE ADDED ****"'. + $logcmd.' && echo "'. + 'You likely need to review the contents of '. + ''.$targetroot.'/'.$target.' to make sure its '. + 'settings are compatible with your overall system"'. + "$logcmd); } && ". + '{ [ $$ECODE != "1" ] || ('. + 'echo "**** ERROR ****"'. + $logcmd.' && echo "'. + 'Configuration source file does not exist '. + ''.$sourceroot.'/'.$source.'"'. "$logcmd); };\n\n"; } elsif ($mode eq 'build' && $build) {