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

svn path=/trunk/mcs/; revision=30501

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 69aee90eeb6d199253a6ef92b8c646b9135f858f..22c16af11af3c1ecea43c5a351c6b427b8a4e527 100644 (file)
--- 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
index ed86a5f8a82382b5a19815aab75edab66640775c..9d3930e99bd0c53652718a204bc40488a02db28e 100644 (file)
--- 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
index 8d1f67f60f9622f38a3f131ded8d33ecde45c6b8..6c1345eb66f56e4f4deba76ff4ae7186b91d1161 100644 (file)
--- 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
index 82afe9c7e191cdfa6788a8b282b56fcaf3b6b1a4..5ebe1fe0a580c8292973df5961034580f7e7fe9b 100644 (file)
--- 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
index 18112069631fa8cc6cda3c5ec423670c6476ab38..95f175f439ffcbff13a5dfa4a8fff7689101afa2 100644 (file)
--- 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
index 8235baab0af03d17ff8d1a4798b221e22e087d62..fae26173217899c14b656ff7c3e2a0d39aba2a88 100755 (executable)
--- 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
index b2b18e91c151a661719d675574da49a4b82fd006..dc2a38f214c89ed114b1447319ce530e3ac20f20 100644 (file)
--- 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
index 4613c243edc5fede06af8a0cd0f7c2e42e970ba6..bae83a0198dffc89a4c39bbb4b33d8ba90ecc818 100644 (file)
--- 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