2004-02-14 Carlos Guzm��n ��lvarez <carlosga@telefonica.net>

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e603fb791f409456508352bf9d0d83cf04f5fe72..e1fdccc5c1bac62a90be76f75d68265dca06532d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,11 @@ SUBDIRS = @libgc_dir@ mono doc docs runtime scripts man data samples
 EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
+if JIT_SUPPORTED
 pkgconfig_DATA= mono.pc mint.pc
+else
+pkgconfig_DATA= mint.pc
+endif
 DISTCLEANFILES= mono.pc mint.pc
 
 #
@@ -20,20 +24,21 @@ fullbuild: remove-binaries mcs-tree-safe-build xinstall-runtime mcs-rest install
 
 mcs-tree-safe-build:
        (cd ../mcs/jay; $(MAKE))
-       (cd ../mcs/mcs; $(MAKE) MCS=mcs)
-       (cd ../mcs/class/corlib; $(MAKE) MCS=mcs)
+       (cd ../mcs/mcs; $(MAKE) MCS=mcs BOOTSTRAP_MCS=mcs)
+       (cd ../mcs/class/corlib; $(MAKE) MCS=mcs BOOTSTRAP_MCS=mcs)
        cp ../mcs/class/lib/mscorlib.dll runtime
        cp ../mcs/mcs/mcs.exe runtime
 
 xinstall-runtime:
        if echo $(SUBDIRS) | grep "libgc " > /dev/null; then (cd libgc; $(MAKE) && $(MAKE) install); fi
        (cd mono; $(MAKE) && $(MAKE) install)
+       (cd runtime; $(MAKE) install assemblies_DATA=mscorlib.dll monobins_DATA=mcs.exe)
 
 mcs-rest:
        (cd ../mcs/class; $(MAKE))
 
 remove-binaries:
-       rm ../mcs/class/lib/mscorlib.dll ../mcs/mcs/mcs.exe runtime/*dll runtime/*.exe >& /dev/null; echo
+       rm ../mcs/class/lib/mscorlib.dll ../mcs/mcs/mcs.exe runtime/*dll runtime/*.exe > /dev/null 2>&1; echo
 
 
 win32getdeps: