Use correct count length in string split

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b5079153b8e860031a83b0cfd7280824caf092e7..6d3780e593115fad2ef84232c0bc2b33e387d6ef 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono
 
@@ -7,7 +6,7 @@ if CROSS_COMPILING
 SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir)
 # 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
+DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native data runtime scripts man samples tools msvc docs
 else
 if ONLY_MOONLIGHT
 SUBDIRS = $(MOONLIGHT_SUBDIRS) runtime
@@ -15,7 +14,7 @@ else
 SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
 # 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
+DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
 endif
 endif
 
@@ -25,9 +24,6 @@ EXTRA_DIST= \
            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
@@ -143,6 +139,7 @@ package-inputs:
                 read output; echo "      <output>$$output</output>"; \
                 read built;  echo "      <built_sources>$$built</built_sources>"; \
                 read libou;  echo "      <library_output>$$libou</library_output>"; \
+                read fx_ver; echo "      <fx_version>$$fx_ver</fx_version>"; \
                 read resp;   echo "      <response>$$resp</response>"; \
                echo "    </project>") >> msvc/scripts/order.xml; \
        done