Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Varga <vargaz@gmail.com>2015-02-25 23:45:17 +0300
committerZoltan Varga <vargaz@gmail.com>2015-02-25 23:45:22 +0300
commit0bab8ed6a0b676cba97db82a091c8ff4a85a471a (patch)
tree8d88ddbb1709747462a4e935ec67292251711251 /runtime
parent9e79098001712adf9b54b809a5bacfa159fbe26e (diff)
[runtime] Remove definitions of MONO_SHARED_DIR from scripts, its not needed anymore.
Diffstat (limited to 'runtime')
-rw-r--r--runtime/Makefile.am4
-rw-r--r--runtime/mono-wrapper.in3
-rw-r--r--runtime/monodis-wrapper.in3
3 files changed, 3 insertions, 7 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index aea6c5faa36..b021efeec4d 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -79,11 +79,9 @@ install-data:
uninstall:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
-## mono --wapi=semdel will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-)
clean-local:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles
- -./mono-wrapper --wapi=semdel
- -rm -fr $(etctmp) $(tmpinst) .wapi
+ -rm -fr $(etctmp) $(tmpinst)
endif BUILD_MCS
diff --git a/runtime/mono-wrapper.in b/runtime/mono-wrapper.in
index 18c8cb5e47b..0ec4811fb5d 100644
--- a/runtime/mono-wrapper.in
+++ b/runtime/mono-wrapper.in
@@ -2,8 +2,7 @@
r='@mono_build_root@'
MONO_CFG_DIR='@mono_cfg_dir@'
PATH="$r/runtime/_tmpinst/bin:$PATH"
-MONO_SHARED_DIR=$r/runtime
-export MONO_CFG_DIR MONO_SHARED_DIR PATH
+export MONO_CFG_DIR PATH
if [ -n "@nacl_self_host@" ]; then
case "$@" in
# gacutil.exe and mdoc.exe require filesystem functionality not
diff --git a/runtime/monodis-wrapper.in b/runtime/monodis-wrapper.in
index bb5d74e2140..cbde63109b1 100644
--- a/runtime/monodis-wrapper.in
+++ b/runtime/monodis-wrapper.in
@@ -1,6 +1,5 @@
#! /bin/sh
r='@mono_build_root@'
MONO_CFG_DIR='@mono_cfg_dir@'
-MONO_SHARED_DIR=$r/runtime
-export MONO_CFG_DIR MONO_SHARED_DIR
+export MONO_CFG_DIR
exec "$r/libtool" --mode=execute -dlopen "$r/mono/mini/libmono-2.0.la" "$r/mono/dis/monodis" "$@"