- Fix a bug in cdfile that was preventing to use the 'nameoncd' attribute

svn path=/trunk/; revision=34225
This commit is contained in:
Marc Piulachs 2008-06-30 19:12:16 +00:00
parent 151b3dafa6
commit dc4f087e94
2 changed files with 5 additions and 5 deletions

View file

@ -5,10 +5,10 @@
<cdfile>icon.ico</cdfile>
<cdfile>readme.txt</cdfile>
<cdfile installbase="$(CDOUTPUT)">hivecls_$(ARCH).inf</cdfile>
<cdfile installbase="$(CDOUTPUT)">hivedef_$(ARCH).inf</cdfile>
<cdfile installbase="$(CDOUTPUT)">hivesft_$(ARCH).inf</cdfile>
<cdfile installbase="$(CDOUTPUT)">hivesys_$(ARCH).inf</cdfile>
<cdfile installbase="$(CDOUTPUT)" nameoncd="hivecls.inf">hivecls_$(ARCH).inf</cdfile>
<cdfile installbase="$(CDOUTPUT)" nameoncd="hivedef.inf">hivedef_$(ARCH).inf</cdfile>
<cdfile installbase="$(CDOUTPUT)" nameoncd="hivesft.inf">hivesft_$(ARCH).inf</cdfile>
<cdfile installbase="$(CDOUTPUT)" nameoncd="hivesys.inf">hivesys_$(ARCH).inf</cdfile>
<cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile>
<cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile>

View file

@ -60,6 +60,6 @@ CDFile::CDFile ( const Project& project,
&cdfileNode );
target = new FileLocation ( OutputDirectory,
target_relative_directory,
nameoncd ? att->value : cdfileNode.value,
nameoncd ? nameoncd->value : cdfileNode.value,
&cdfileNode );
}