From bb662563e0a6845918785edcddd0062c1aa7ce5d Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Wed, 25 Dec 2002 21:01:07 +0000 Subject: [PATCH] 2002-12-25 Alp Toker * doc/makefile: Accept the RUNTIME parameter for platforms without /usr/bin/mono * sample/gconf/Makefile: ditto svn path=/trunk/gtk-sharp/; revision=9890 --- ChangeLog | 6 ++++++ doc/makefile | 3 ++- sample/gconf/Makefile | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d6d30838..fbbd26992 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-12-25 Alp Toker + + * doc/makefile: Accept the RUNTIME parameter for platforms without + /usr/bin/mono + * sample/gconf/Makefile: ditto + 2002-12-24 Mike Kestner * generator/ObjectGen.cs : generate protected GType ctors diff --git a/doc/makefile b/doc/makefile index 07134d61a..15849443e 100644 --- a/doc/makefile +++ b/doc/makefile @@ -1,9 +1,10 @@ include makefile.common MCS=mcs +RUNTIME=mono $(stage2_files): %stage2.xml: %stage1.xml introspect.exe - mono introspect.exe $< $@ + $(RUNTIME) introspect.exe $< $@ introspect.exe: introspect.cs $(MCS) -o introspect.exe -r System.Xml introspect.cs diff --git a/sample/gconf/Makefile b/sample/gconf/Makefile index 213f268cf..27ca59b4c 100644 --- a/sample/gconf/Makefile +++ b/sample/gconf/Makefile @@ -4,6 +4,7 @@ SOURCES = \ # MCS = mcs +RUNTIME = /usr/bin/mono GCONFDIR=../../gconf all: sample.exe @@ -12,7 +13,7 @@ sample.exe: sample.schema sample.glade $(SOURCES) $(MCS) /out:sample.exe $(SOURCES) /r:../../glib/glib-sharp.dll /r:../../pango/pango-sharp.dll /r:../../atk/atk-sharp.dll /r:../../art/art-sharp.dll /r:../../gdk/gdk-sharp.dll /r:$(GCONFDIR)/GConf/gconf-sharp.dll /r:../../gtk/gtk-sharp.dll /r:../../gnome/gnome-sharp.dll /r:../../glade/glade-sharp.dll /r:$(GCONFDIR)/GConf.PropertyEditors/gconf-sharp-peditors.dll /r:System.Drawing /resource:sample.glade Settings.cs: sample.schema - MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll mono $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample sample.schema > Settings.cs + MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample sample.schema > Settings.cs install: all GCONF_CONFIG_SOURCE="" gconftool-2 --makefile-install-rule sample.schema