paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-08 10:59:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed zipinstall with defaultdir

Browse Source
This commit is contained in:
peter 2000-02-08 00:03:35 +00:00
parent 05eefcc78d
commit 3063ddad2d
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
utils/fpcmake.pp
View File

@ -641,23 +641,26 @@ var
begin
if userini.section[rule2sec[rule]] then
hs:=hs+' fpc_'+rulestr[rule];
if userini.DefaultDir<>'' then
hs:=hs+' $(addsuffix _'+rulestr[rule]+','+userini.defaultdir+')'
else
if (userini.DefaultBuildDir<>'') and (rule2bic[rule]=bic_build) then
hs:=hs+' $(addsuffix _'+rulestr[rule]+','+userini.defaultbuilddir+')'
else
if (userini.DefaultInstallDir<>'') and (rule2bic[rule]=bic_install) then
hs:=hs+' $(addsuffix _'+rulestr[rule]+','+userini.defaultinstalldir+')'
else
if (userini.DefaultZipInstallDir<>'') and (rule2bic[rule]=bic_zipinstall) then
hs:=hs+' $(addsuffix _'+rulestr[rule]+','+userini.defaultzipinstalldir+')'
else
if (userini.DefaultCleanDir<>'') and (rule2bic[rule]=bic_clean) then
hs:=hs+' $(addsuffix _'+rulestr[rule]+','+userini.defaultcleandir+')'
else
if rulediralso[rule] and (not TargetStringEmpty(userini.targetdirs)) then
hs:=hs+' $(addsuffix _'+rulestr[rule]+',$(DIROBJECTS))';
if rulediralso[rule] then
begin
if userini.DefaultDir<>'' then
hs:=hs+' $(addsuffix _'+rulestr[rule]+','+userini.defaultdir+')'
else
if (userini.DefaultBuildDir<>'') and (rule2bic[rule]=bic_build) then
hs:=hs+' $(addsuffix _'+rulestr[rule]+','+userini.defaultbuilddir+')'
else
if (userini.DefaultInstallDir<>'') and (rule2bic[rule]=bic_install) then
hs:=hs+' $(addsuffix _'+rulestr[rule]+','+userini.defaultinstalldir+')'
else
if (userini.DefaultZipInstallDir<>'') and (rule2bic[rule]=bic_zipinstall) then
hs:=hs+' $(addsuffix _'+rulestr[rule]+','+userini.defaultzipinstalldir+')'
else
if (userini.DefaultCleanDir<>'') and (rule2bic[rule]=bic_clean) then
hs:=hs+' $(addsuffix _'+rulestr[rule]+','+userini.defaultcleandir+')'
else
if (not TargetStringEmpty(userini.targetdirs)) then
hs:=hs+' $(addsuffix _'+rulestr[rule]+',$(DIROBJECTS))';
end;
end;
if hs<>'' then
begin
@ -1300,7 +1303,10 @@ begin
end.
{
$Log$
Revision 1.30 2000-02-02 11:30:00 peter
Revision 1.31 2000-02-08 00:03:35 peter
* fixed zipinstall with defaultdir
Revision 1.30 2000/02/02 11:30:00 peter
* fixed sharedlibunitobjects typo
Revision 1.29 2000/01/28 12:10:46 peter