From dc4f087e9409a5e2035201d78f5bfc2a378bdfe7 Mon Sep 17 00:00:00 2001
From: Marc Piulachs <marc.piulachs@live.com>
Date: Mon, 30 Jun 2008 19:12:16 +0000
Subject: [PATCH] - Fix a bug in cdfile that was preventing to use the
 'nameoncd' attribute

svn path=/trunk/; revision=34225
---
 reactos/boot/bootdata/bootdata.rbuild | 8 ++++----
 reactos/tools/rbuild/cdfile.cpp       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/reactos/boot/bootdata/bootdata.rbuild b/reactos/boot/bootdata/bootdata.rbuild
index 5e38becc6fd..5ce9ad304a8 100644
--- a/reactos/boot/bootdata/bootdata.rbuild
+++ b/reactos/boot/bootdata/bootdata.rbuild
@@ -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>
 
diff --git a/reactos/tools/rbuild/cdfile.cpp b/reactos/tools/rbuild/cdfile.cpp
index 20a14a9b713..e577d25ab53 100644
--- a/reactos/tools/rbuild/cdfile.cpp
+++ b/reactos/tools/rbuild/cdfile.cpp
@@ -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 );
 }