[ros-diffs] [hpoussin] 28135: syssetup.inf really belongs to output directory, not intermediate one

Author: hpoussin
Date: Fri Aug  3 18:33:43 2007
New Revision: 28135

URL: http://svn.reactos.org/svn/reactos?rev=28135&view=rev
Log:
syssetup.inf really belongs to output directory, not intermediate one

Modified:
    trunk/reactos/Makefile
    trunk/reactos/media/inf/inf.rbuild
    trunk/reactos/tools/rbuild/syssetupgenerator.cpp

Modified: trunk/reactos/Makefile
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28135&r1=…
==============================================================================
--- trunk/reactos/Makefile (original)
+++ trunk/reactos/Makefile Fri Aug  3 18:33:43 2007
@@ -415,7 +415,7 @@
 	$(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

Modified: trunk/reactos/media/inf/inf.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=2…
==============================================================================
--- trunk/reactos/media/inf/inf.rbuild (original)
+++ trunk/reactos/media/inf/inf.rbuild Fri Aug  3 18:33:43 2007
@@ -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>

Modified: trunk/reactos/tools/rbuild/syssetupgenerator.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/syssetupgener…
==============================================================================
--- trunk/reactos/tools/rbuild/syssetupgenerator.cpp (original)
+++ trunk/reactos/tools/rbuild/syssetupgenerator.cpp Fri Aug  3 18:33:43 2007
@@ -39,7 +39,7 @@
 	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 );