diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2004-06-18 16:07:45 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2004-06-18 16:07:45 +0400 |
| commit | 5ebd13b632824688e3a5e907318643a29b5b9853 (patch) | |
| tree | 904b5aa79ec55b226101229b39575c0a4dc56662 /runtime | |
| parent | 70e02042353da3bfca6c3092386856941bbce3eb (diff) | |
* runtime/Makefile.am ($(monoone_DATA) $(monotwo_DATA) $(monobins_DATA)):
Test if files exist in the mcs/ tree before creating symlinks.
Remove symlinks before creating them again.
* runtime/net_1_1/Makefile.am (mscorlib.dll $(gac_assemblies)): Likewise.
* runtime/net_2_0/Makefile.am (mscorlib.dll $(gac_assemblies)): Likewise.
Make real bug more explicit.
svn path=/trunk/mono/; revision=29871
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 6 | ||||
| -rw-r--r-- | runtime/net_1_1/Makefile.am | 2 | ||||
| -rw-r--r-- | runtime/net_2_0/Makefile.am | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 234b5a37210..411ae732d22 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -83,7 +83,11 @@ $(monoone_DATA) $(monotwo_DATA) $(monobins_DATA): gacutil.exe) d=tools/gacutil ;; \ gmcs.exe) d=gmcs ;; \ esac; \ - echo " cd $(srcdir) && $(LN_S) ../../mcs/$$d/$@ $@" ; \ + echo "test -f $(top_srcdir)/../mcs/$$d/$@" ; \ + test -f $(top_srcdir)/../mcs/$$d/$@ || exit 1 ; \ + echo "rm -f $(srcdir)/$@" ; \ + rm -f $(srcdir)/$@ ; \ + echo "cd $(srcdir) && $(LN_S) ../../mcs/$$d/$@ $@" ; \ cd $(srcdir) && $(LN_S) ../../mcs/$$d/$@ $@ copy_dlls: diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am index 066ab2c6c32..9254b5d7e7d 100644 --- a/runtime/net_1_1/Makefile.am +++ b/runtime/net_1_1/Makefile.am @@ -80,6 +80,8 @@ EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) MAINTAINERCLEANFILES = $(EXTRA_DIST) mscorlib.dll $(gac_assemblies): + test -f $(top_srcdir)/../mcs/class/lib/default/$@ + -rm -f $(srcdir)/$@ cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/default/$@ $@ all-local: $(gac_assemblies) diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am index 9df6e46b898..0510755e10c 100644 --- a/runtime/net_2_0/Makefile.am +++ b/runtime/net_2_0/Makefile.am @@ -84,6 +84,8 @@ EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) MAINTAINERCLEANFILES = $(EXTRA_DIST) mscorlib.dll $(gac_assemblies): + test -f $(top_srcdir)/../mcs/class/lib/net_2_0/$@ + -rm -f $(srcdir)/$@ cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/net_2_0/$@ $@ all-local: $(gac_assemblies) |