From 793a75ec151ab3cd35205ac49d6cce624fd7bb1f Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Thu, 19 Jun 2003 22:38:21 +0000
Subject: [PATCH] fixed update on changing package usage options

git-svn-id: trunk@4290 -
---
 lcl/include/custompanel.inc |  3 +--
 packager/packagedefs.pas    |  3 ++-
 packager/pkgoptionsdlg.pas  | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lcl/include/custompanel.inc b/lcl/include/custompanel.inc
index c2d53f09c2..1f5ce1cea4 100644
--- a/lcl/include/custompanel.inc
+++ b/lcl/include/custompanel.inc
@@ -36,8 +36,7 @@ begin
   FBevelInner := bvNone;
   FBevelWidth := 1;
   FAlignment := taCenter;
-  Height := 41;
-  Width := 185;
+  SetInitialBounds(0,0,170,50);
   Color:= clBackground;
   ParentColor := True;
 end;
diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas
index 51abad2710..23f3e39267 100644
--- a/packager/packagedefs.pas
+++ b/packager/packagedefs.pas
@@ -1821,13 +1821,14 @@ begin
   FMacros.OnSubstitution:=@OnMacroListSubstitution;
   FCompilerOptions:=TPkgCompilerOptions.Create(Self);
   FCompilerOptions.ParsedOpts.OnLocalSubstitute:=@SubstitutePkgMacro;
-  FCompilerOptions.ParsedOpts.InvalidateGraphOnChange:=true;
   FCompilerOptions.DefaultMakeOptionsFlags:=[ccloNoLinkerOpts];
   FUsageOptions:=TPkgAdditionalCompilerOptions.Create(Self);
   FUsageOptions.ParsedOpts.OnLocalSubstitute:=@SubstitutePkgMacro;
   FDefineTemplates:=TLazPackageDefineTemplates.Create(Self);
   fPublishOptions:=TPublishPackageOptions.Create(Self);
   Clear;
+  FCompilerOptions.ParsedOpts.InvalidateGraphOnChange:=true;
+  FUsageOptions.ParsedOpts.InvalidateGraphOnChange:=true;
 end;
 
 destructor TLazPackage.Destroy;
diff --git a/packager/pkgoptionsdlg.pas b/packager/pkgoptionsdlg.pas
index 6b26c2bcaa..a64b94dbb6 100644
--- a/packager/pkgoptionsdlg.pas
+++ b/packager/pkgoptionsdlg.pas
@@ -40,7 +40,7 @@ interface
 uses
   Classes, SysUtils, Forms, Controls, Buttons, LResources, ExtCtrls, StdCtrls,
   Spin, Dialogs, PathEditorDlg, IDEProcs, IDEOptionDefs, LazarusIDEStrConsts,
-  BrokenDependenciesDlg, PackageDefs, PackageSystem;
+  BrokenDependenciesDlg, PackageDefs, PackageSystem, CompilerOptions;
   
 type
   TPackageOptionsDialog = class(TForm)
@@ -394,10 +394,10 @@ begin
   else LazPackage.AutoUpdate:=pupAsNeeded;
   end;
   with LazPackage.UsageOptions do begin
-    UnitPath:=UnitPathEdit.Text;
-    IncludePath:=IncludePathEdit.Text;
-    ObjectPath:=ObjectPathEdit.Text;
-    LibraryPath:=LibraryPathEdit.Text;
+    UnitPath:=TrimSearchPath(UnitPathEdit.Text,'');
+    IncludePath:=TrimSearchPath(IncludePathEdit.Text,'');
+    ObjectPath:=TrimSearchPath(ObjectPathEdit.Text,'');
+    LibraryPath:=TrimSearchPath(LibraryPathEdit.Text,'');
     LinkerOptions:=LinkerOptionsMemo.Text;
     CustomOptions:=CustomOptionsMemo.Text;
   end;