diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2004-06-29 14:23:13 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2004-06-29 14:23:13 +0400 |
| commit | 60633644e57e2b6adc34dc11907a62f85ec9b1ad (patch) | |
| tree | 96823a1475e2d51aaa5f3c0ba656f5de9c85dd0c /runtime | |
| parent | 3b6be82db4842f47d43d016c7dca3d600b4f132a (diff) | |
(GAC_ROOT_DIR): Renamed from GAC_DIR.
(GAC_DIR): New define that doesn't include $(DESTDIR).
(install-data-local,uninstall-local): Use them. Use in-tree mono
runtime, not the installed one.
svn path=/trunk/mono/; revision=30506
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/net_1_1/Makefile.am | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am index cd6060dd51e..6f717c5256a 100644 --- a/runtime/net_1_1/Makefile.am +++ b/runtime/net_1_1/Makefile.am @@ -12,9 +12,11 @@ endif MONO_CSHARP_DEBUGGER = Mono.CSharp.Debugger if PLATFORM_WIN32 -GAC_DIR = `cygpath -w $(DESTDIR)$(libdir)` +GAC_DIR = `cygpath -w $(libdir)` +GAC_ROOT_DIR = `cygpath -w $(DESTDIR)$(libdir)` else -GAC_DIR = $(DESTDIR)$(libdir) +GAC_DIR = $(libdir) +GAC_ROOT_DIR = $(DESTDIR)$(libdir) endif gac_assemblies_list = \ @@ -88,17 +90,17 @@ all-local: $(gac_assemblies) install-data-local: @if test -n '$(gac_assemblies)'; then \ for i in ''$(gac_assemblies); do \ - echo "MONO_PATH=$(srcdir) $(DESTDIR)$(bindir)/mono $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_DIR)" ; \ + echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \ MONO_PATH=$(srcdir) \ - $(LIBTOOL) --mode=execute $(DESTDIR)$(bindir)/mono $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_DIR) || exit 1 ; \ + $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \ done; fi uninstall-local: @if test -n '$(gac_assemblies_list)'; then \ for i in ''$(gac_assemblies_list); do \ - echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_DIR)" ; \ + echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \ MONO_PATH=$(srcdir) \ - $(LIBTOOL) --mode=execute $(DESTDIR)$(bindir)/mono $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_DIR) || true ; \ + $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /u $$i /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || true ; \ done; fi copy_dlls: |