From: Dick Porter <dick@acm.org>
Date: Wed, 22 Oct 2003 14:23:54 +0000 (-0000)
Subject: 2003-10-22  Dick Porter  <dick@ximian.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=0e189be0c934f2a5114c14c50538beee42d160e1;p=mono.git

2003-10-22  Dick Porter  <dick@ximian.com>

	* platforms/win32.make:
	* platforms/linux.make:
	* rules.make: Added RESGEN platform-specific tool.

svn path=/trunk/mcs/; revision=19300
---

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 1f11d237f77..3cc9a142d31 100644
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-22  Dick Porter  <dick@ximian.com>
+
+	* platforms/win32.make:
+	* platforms/linux.make:
+	* rules.make: Added RESGEN platform-specific tool.
+
 2003-08-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* config-default.make: the /nowarn arguments are now set on a per
diff --git a/mcs/build/platforms/linux.make b/mcs/build/platforms/linux.make
index cf69bff0edf..3f78994ef77 100644
--- a/mcs/build/platforms/linux.make
+++ b/mcs/build/platforms/linux.make
@@ -9,6 +9,7 @@ PLATFORM_RUNTIME = $(RUNTIME)
 PLATFORM_CORLIB = corlib.dll
 
 BOOTSTRAP_MCS = mcs
+RESGEN = monoresgen
 
 # Define this if this ever will work on Linux
 # PLATFORM_MAKE_CORLIB_CMP = yes
diff --git a/mcs/build/platforms/win32.make b/mcs/build/platforms/win32.make
index e2023b2ff5b..8da86872add 100644
--- a/mcs/build/platforms/win32.make
+++ b/mcs/build/platforms/win32.make
@@ -10,6 +10,7 @@ PLATFORM_CORLIB = mscorlib.dll
 
 BOOTSTRAP_MCS = csc.exe
 MCS = $(BOOTSTRAP_MCS)
+RESGEN = resgen.exe
 
 PLATFORM_MAKE_CORLIB_CMP = yes
 PLATFORM_TWEAK_CORLIB_SOURCES=cat - corlib.dll.win32-excludes |sort |uniq -u
diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index 8f3d2ac7c06..a31a49e87cf 100644
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -43,6 +43,7 @@ export MKINSTALLDIRS
 export TEST_HARNESS
 export BOOTSTRAP_MCS
 export DESTDIR
+export RESGEN
 
 # Get this so the platform.make platform-check rule doesn't become the
 # default target
diff --git a/mcs/class/Npgsql/Makefile b/mcs/class/Npgsql/Makefile
index 0ebfe6d1a13..906f27721b0 100755
--- a/mcs/class/Npgsql/Makefile
+++ b/mcs/class/Npgsql/Makefile
@@ -54,7 +54,7 @@ RESX_RES = Npgsql/NpgsqlState.resources Npgsql/NpgsqlClosedState.resources Npgsq
 all: $(RESX_RES) $(the_lib)
 
 %.resources: %.resx
-	monoresgen $<
+	$(RESGEN) $<
 
 clean: clean-recursive clean-local