[Jcl-checkins] jcl/install/build build.dpr,1.5,1.6 build.exe,1.6,1.7

[Andreas H. <ah...@us...>]

Update of /cvsroot/jcl/jcl/install/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21806/install/build

Modified Files:
	build.dpr build.exe 
Log Message:
dcc32.cfg fix

Index: build.exe
===================================================================
RCS file: /cvsroot/jcl/jcl/install/build/build.exe,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
Binary files /tmp/cvsoIMEBs and /tmp/cvs4taz1G differ

Index: build.dpr
===================================================================
RCS file: /cvsroot/jcl/jcl/install/build/build.dpr,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.dpr	22 Mar 2005 21:13:25 -0000	1.5
--- build.dpr	22 Mar 2005 21:18:13 -0000	1.6
***************
*** 1041,1050 ****
      begin
        ReadLn(f, S);
!       Found := SameText(S, '-u"' + Edition.RootDir + '\lib";"' + Edition.RootDir + '\lib\obj"') or
!                SameText(S, '-u"' + ExtractShortPathName(Edition.RootDir) + '\lib";"' + ExtractShortPathName(Edition.RootDir) + '\lib\obj"') or
!                SameText(S, '-u' + ExtractShortPathName(Edition.RootDir) + '\lib;' + ExtractShortPathName(Edition.RootDir) + '\lib\obj') or
!                SameText(S, '-u"' + Edition.RootDir + '\lib"') or
!                SameText(S, '-u"' + ExtractShortPathName(Edition.RootDir) + '\lib"') or
!                SameText(S, '-u' + ExtractShortPathName(Edition.RootDir) + '\lib');
      end;
      CloseFile(f);
--- 1041,1052 ----
      begin
        ReadLn(f, S);
!       if Edition.Typ = Delphi then
!         Found := SameText(S, '-u"' + Edition.RootDir + '\lib"') or
!                  SameText(S, '-u"' + ExtractShortPathName(Edition.RootDir) + '\lib"') or
!                  SameText(S, '-u' + ExtractShortPathName(Edition.RootDir) + '\lib')
!       else
!         Found := SameText(S, '-u"' + Edition.RootDir + '\lib";"' + Edition.RootDir + '\lib\obj"') or
!                  SameText(S, '-u"' + ExtractShortPathName(Edition.RootDir) + '\lib";"' + ExtractShortPathName(Edition.RootDir) + '\lib\obj"') or
!                  SameText(S, '-u' + ExtractShortPathName(Edition.RootDir) + '\lib;' + ExtractShortPathName(Edition.RootDir) + '\lib\obj');
      end;
      CloseFile(f);