diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2004-05-01 03:32:48 +0400 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2004-05-01 03:32:48 +0400 |
| commit | ab101691079d1cd469fce2ead9d4efa238cc7c2d (patch) | |
| tree | c555ada5579b488c2398cfcf0dfe08ca369db25e /runtime | |
| parent | 9a59621e35449ff6b92221081579ef910a795ba7 (diff) | |
Remove missing assemblies
Clean files
Use root argument
svn path=/trunk/mono/; revision=26478
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/net_1_1/Makefile.am | 9 | ||||
| -rw-r--r-- | runtime/net_2_0/Makefile.am | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am index 75ec716b405..3d85026eabd 100644 --- a/runtime/net_1_1/Makefile.am +++ b/runtime/net_1_1/Makefile.am @@ -58,7 +58,6 @@ gac_assemblies_list = \ System.Security \ System.ServiceProcess \ System.Web \ - System.Web.Services \ System.Windows.Forms \ System.Xml @@ -71,7 +70,9 @@ non_gac_assemblies = \ corlibdir = $(libdir) dist_corlib_DATA = mscorlib.dll -EXTRA_DIST = $(gac_assemblies) +EXTRA_DIST = $(gac_assemblies) $(non_gac_assemblies) + +CLEANFILES = $(EXTRA_DIST) # # Keep in sync with mono/mono/metadata/Makefile.am @@ -93,9 +94,9 @@ all-local: $(gac_assemblies) install-data-local: @if test -n '$(gac_assemblies)'; then \ for i in ''$(gac_assemblies); do \ - echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /i $(srcdir)/$$i.dll /f /prefix $(DESTDIR)$(libdir)/mono/gac" ; \ + echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) -i $(srcdir)/$$i.dll /f /root $(DESTDIR)" ; \ MONO_PATH=$(srcdir) \ - $(mono_runtime) $(gacutil) /i $(srcdir)/$$i /f /prefix $(DESTDIR)$(libdir)/mono/gac || exit 1 ; \ + $(mono_runtime) $(gacutil) -i $(srcdir)/$$i /f /root $(DESTDIR) || exit 1 ; \ done; fi uninstall-local: diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am index 10f23f86c75..ca5863e7de4 100644 --- a/runtime/net_2_0/Makefile.am +++ b/runtime/net_2_0/Makefile.am @@ -71,7 +71,8 @@ non_gac_assemblies = \ corlibdir = $(libdir)/net_2_0 dist_corlib_DATA = mscorlib.dll -EXTRA_DIST = $(gac_assemblies) +EXTRA_DIST = $(gac_assemblies) $(non_gac_assemblies) +CLEANFILES = $(EXTRA_DIST) # # Keep in sync with mono/mono/metadata/Makefile.am @@ -93,9 +94,9 @@ all-local: $(gac_assemblies) install-data-local: @if test -n '$(gac_assemblies)'; then \ for i in ''$(gac_assemblies); do \ - echo "MONO_PATH=$(srcdir)/../net_1_1 $(mono_runtime) $(gacutil) /i $(srcdir)/$$i /f /prefix $(DESTDIR)$(libdir)/mono/gac" ; \ + echo "MONO_PATH=$(srcdir)/../net_1_1 $(mono_runtime) $(gacutil) -i $(srcdir)/$$i /f /root $(DESTDIR)" ; \ MONO_PATH=$(srcdir)/../net_1_1 \ - $(mono_runtime) $(gacutil) /i $(srcdir)/$$i /f /prefix $(DESTDIR)$(libdir)/mono/gac || exit 1 ; \ + $(mono_runtime) $(gacutil) -i $(srcdir)/$$i /f /root $(DESTDIR) || exit 1 ; \ done; fi uninstall-local: |