* get the svn r number when vpath building

* look in the srcdir for the dist-related scripts

This commit was SVN r5218.

Makefile.am

@@ -20,4 +20,4 @@ SUBDIRS = config include etc src test
 EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE README.alpha
 
 dist-hook:
-	csh config/distscript.csh $(PACKAGE)-$(OMPI_VERSION) $(OMPI_VERSION) $(OMPI_SVN_VERSION)
+	csh "$(top_srcdir)/config/distscript.csh" $(PACKAGE)-$(OMPI_VERSION) $(OMPI_VERSION) $(OMPI_SVN_VERSION)

config/ompi_get_version.m4

@@ -57,8 +57,8 @@ if test -n "$gv_ver_file" -a -f "$gv_ver_file"; then
 
     if test "$gv_want_svn" = "1"; then
         if test "$gv_svn_r" = "-1"; then
-            if test -d .svn; then
-                ver="r`svnversion .`"
+            if test -d "$srcdir/.svn"; then
+                ver="r`svnversion \"$srcdir\"`"
             else
                 ver="svn`date '+%m%d%Y'`"
             fi

src/asm/Makefile.am

@@ -29,12 +29,12 @@ generated/@OMPI_ASM_FILE@: base/@OMPI_ASSEMBLY_ARCH@.asm
 
 atomic-asm.s: generated/@OMPI_ASM_FILE@
 	rm -f atomic-asm.s
-	@ if test -f $(top_srcdir)/src/asm/generated/@OMPI_ASM_FILE@ ; then \
-	    cmd="ln -s $(top_srcdir)/src/asm/generated/@OMPI_ASM_FILE@ atomic-asm.s" ; \
+	@ if test -f "$(top_srcdir)/src/asm/generated/@OMPI_ASM_FILE@" ; then \
+	    cmd="ln -s \"$(top_srcdir)/src/asm/generated/@OMPI_ASM_FILE@\" atomic-asm.s" ; \
 	    echo "$$cmd" ; \
 	    $$cmd ; \
 	else \
-	    cmd="ln -s $(top_builddir)/src/asm/generated/@OMPI_ASM_FILE@ atomic-asm.s" ; \
+	    cmd="ln -s \"$(top_builddir)/src/asm/generated/@OMPI_ASM_FILE@\" atomic-asm.s" ; \
 	    echo "$$cmd" ; \
 	    $$cmd ; \
 	fi
@@ -79,5 +79,5 @@ maintainer-clean-local:
 # Copy over all the generated files
 #
 dist-hook:
-	mkdir ${distdir}/generated
-	$(PERL) generate-all-asm.pl "$(PERL)" "$(srcdir)" "$(distdir)"
+	mkdir "${distdir}/generated"
+	$(PERL) "$(top_srcdir)/src/asm/generate-all-asm.pl" "$(PERL)" "$(srcdir)" "$(distdir)"