Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-22 04:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

syssetup.inf really belongs to output directory, not intermediate one

Browse source 
svn path=/trunk/; revision=28135
This commit is contained in:
Hervé Poussineau 2007-08-03 14:33:43 +00:00
parent 623ca2cf0a
commit d5527355ec
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/Makefile
View file

@ -415,7 +415,7 @@ PREAUTO := \
$(NCI_SERVICE_FILES)
$(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
${mkdir} $(INTERMEDIATE_)media$(SEP)inf 2>$(NUL)
${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL)
$(ECHO_RBUILD)
$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -rReactOS-$(ARCH).rbuild mingw
@$(MAKE) psdk

2
reactos/media/inf/inf.rbuild
View file

@ -14,7 +14,7 @@
<installfile base="inf">nettcpip.inf</installfile>
<installfile base="inf">ports.inf</installfile>
<installfile base="inf">scsi.inf</installfile>
<installfile base="inf" root="intermediate">syssetup.inf</installfile>
<installfile base="inf" root="output">syssetup.inf</installfile>
<installfile base="inf">usbport.inf</installfile>
<installfile base="inf">usbstor.inf</installfile>
<installfile base="inf">xboxdisp.inf</installfile>

2
reactos/tools/rbuild/syssetupgenerator.cpp
View file

@ -39,7 +39,7 @@ SysSetupGenerator::Generate ()
unsigned long errorLine;
string syssetupTemplate = "media" + sSep + "inf" + sSep + "syssetup.inf.tpl";
string syssetup = Environment::GetIntermediatePath() + sSep + "media" + sSep + "inf" + sSep + "syssetup.inf";
string syssetup = Environment::GetOutputPath() + sSep + "media" + sSep + "inf" + sSep + "syssetup.inf";
if ( 0 != InfHostOpenFile ( &inf, syssetupTemplate.c_str (), &errorLine ) )
throw new FileNotFoundException ( syssetupTemplate );