Use $(RESGEN) instead of $(INTERNAL_RESGEN).

svn path=/trunk/mcs/; revision=30501
baulig · Jun 29, 2004 · cd4559a · cd4559a
1 parent 7f5cc73
commit cd4559a
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 5 deletions.
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-28  Raja R Harinath  <rharinath@novell.com>
+
+	* platforms/linux.make (RESGEN): Define using $(INTERNAL_RESGEN).
+
 2004-06-21  Raja R Harinath  <rharinath@novell.com>
 
 	* executable.make ($(PROGRAM)): Move depend on the makefrags ...

diff --git a/mcs/build/platforms/linux.make b/mcs/build/platforms/linux.make
@@ -9,7 +9,7 @@ PLATFORM_RUNTIME = $(RUNTIME)
 PLATFORM_CORLIB = mscorlib.dll
 
 BOOTSTRAP_MCS = mcs
-RESGEN = monoresgen
+RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
 
 PLATFORM_PATH_SEPARATOR = :
 

diff --git a/mcs/class/Microsoft.VisualBasic/ChangeLog b/mcs/class/Microsoft.VisualBasic/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-28  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile ($(TXT_RESOURCES) $(RESX_RESOURCES)): Use $(RESGEN).
+
 2004-06-23  Jambunathan K  <kjambunathan@novell.com>
 	* Microsoft.VisualBasic.dll.sources: Added RandomVBFile.cs and BinaryVBFile.cs
 

diff --git a/mcs/class/Microsoft.VisualBasic/Makefile b/mcs/class/Microsoft.VisualBasic/Makefile
@@ -19,7 +19,7 @@ include ../../build/library.make
 $(the_lib): $(TXT_RESOURCES) $(RESX_RESOURCES)
 
 $(TXT_RESOURCES): %.resources: %.txt
-	MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN) $<
+	$(RESGEN) $<
 
 $(RESX_RESOURCES): %.resources: %.resx
-	MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN) $<
+	$(RESGEN) $<
diff --git a/mcs/class/Npgsql/ChangeLog b/mcs/class/Npgsql/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-28  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (%.resources): Use $(RESGEN).
+
 2004-06-22  Raja R Harinath  <rharinath@novell.com>
 
 	* Makefile: Use $(PLATFORM_PATH_SEPARATOR) in MONO_PATH.

diff --git a/mcs/class/Npgsql/Makefile b/mcs/class/Npgsql/Makefile
@@ -39,7 +39,7 @@ RESX_RES = Npgsql/NpgsqlState.resources Npgsql/NpgsqlClosedState.resources Npgsq
 all: $(RESX_RES) $(the_lib)
 
 %.resources: %.resx
-	MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN) $<
+	$(RESGEN) $<
 
 clean: clean-recursive clean-local
 

diff --git a/mcs/nunit20/util/ChangeLog b/mcs/nunit20/util/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-28  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (%.resources): Use $(RESGEN).
+
 2004-06-21  Raja R Harinath  <rharinath@novell.com>
 
 	* Makefile (LIBRARY_SNK): Sign with nunit.key.
diff --git a/mcs/nunit20/util/Makefile b/mcs/nunit20/util/Makefile
@@ -17,7 +17,7 @@ EXTRA_DISTFILES = \
 	Transform.resx
 
 %.resources: %.resx
-	MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN) $<
+	$(RESGEN) $<
 
 include ../../build/library.make