[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.10.1-4-37-g03befb1
Mirco Bauer
meebey at meebey.net
Sun Aug 7 16:04:47 UTC 2011
The following commit has been merged in the master-experimental branch:
commit 486662bf7e45cac4ec6df8a354549283150f6557
Merge: ee6af4697efe0035820b2c76dc700219bb537af8 f165789868007ccb2d56b70e6e3cac72f3b6cf22
Author: Mirco Bauer <meebey at meebey.net>
Date: Sun Aug 7 17:45:45 2011 +0200
Merge commit 'upstream/2.10.3' into master-experimental-patches/disable_building_docs
diff --combined Makefile.am
index af5403b,b507915..51ae627
--- a/Makefile.am
+++ b/Makefile.am
@@@ -4,7 -4,7 +4,7 @@@ ACLOCAL_AMFLAGS = -I
MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono
if CROSS_COMPILING
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir)
+SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = po libgc eglib mono ikvm-native data runtime scripts man samples tools msvc docs
@@@ -12,14 -12,23 +12,23 @@@ els
if ONLY_MOONLIGHT
SUBDIRS = $(MOONLIGHT_SUBDIRS) runtime
else
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
+SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
endif
endif
- EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs autogen.sh
+ EXTRA_DIST= \
+ LICENSE \
+ autogen.sh \
+ build-mingw32.sh \
+ mkinstalldirs \
+ mono-uninstalled.pc.in \
+ nls.m4 \
+ po.m4 \
+ progtest.m4 \
+ winconfig.h
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
--
mono
More information about the Pkg-mono-svn-commits
mailing list