Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mc05.(none):/space/tomas/mysql-4.1-make

4 files changed, 58 insertions, 22 deletions

diff --git a/configure.in b/configure.in
index 6ccbf087b91..c9738ed63a3 100644
--- a/configure.in
+++ b/configure.in
@@ -2757,6 +2757,7 @@ EOF
     no) flag="-R" ;;
     *)  flag="-D" ;;
     esac
+    flag="$flag --VERSION=$VERSION --PACKAGE=$PACKAGE"
     (cd ndb && ./configure $flag) \
     || AC_MSG_ERROR([could not configure NDB Cluster])
     echo "END OF NDB CLUSTER CONFIGURATION"
diff --git a/ndb/Epilogue.mk b/ndb/Epilogue.mk
index 89cd4034208..dc78a66a1f8 100644
--- a/ndb/Epilogue.mk
+++ b/ndb/Epilogue.mk
@@ -851,3 +851,26 @@ ebrowse: DUMMY
 	cd $(NDB_TOP); find . -name "*.hpp" -or -name "*.cpp" -or -name "*.h" -or -name "*.c" > tmpfile~ 
 	cd $(NDB_TOP); ebrowse --file tmpfile~ 
 	cd $(NDB_TOP); rm -f tmpfile~
+
+srcdir = $(NDB_TOP)
+top_distdir = $(NDB_TOP)/..
+mkinstalldirs := /bin/sh ../mkinstalldirs
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)/ndb
+
+distdir:
+	$(mkinstalldirs) $(distdir)
+	@list='$(shell /bin/sh SrcDist.sh)'; for file in $$list; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -f $$d/$$file; then \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
diff --git a/ndb/SrcDist.sh b/ndb/SrcDist.sh
index dbc098c0611..03e697b1475 100644
--- a/ndb/SrcDist.sh
+++ b/ndb/SrcDist.sh
@@ -1,5 +1,5 @@
 #
-# Invoked from scripts/make_binary_distribution as "sh BinDist.sh".
+# Invoked from make distdir.
 # Prints list of dirs and files to include under mysql/ndb.
 #
 
@@ -29,35 +29,35 @@ __END__
 
 # docs
 
-#find docs/*.html docs/*.pdf -print | sort -t/
+#find docs/*.html docs/*.pdf -print 
 
 # include
 
-find include -print | grep -v /SCCS | sort -t/
+find include -print | grep -v /SCCS 
 
 # config
 
-find config -print | grep -v /SCCS | sort -t/
+find config -print | grep -v /SCCS 
 
 # tools
 
-find tools -print | grep -v /SCCS | grep -v '\.o' | grep -v tools/ndbsql | sort -t/
+find tools -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend' | grep -v tools/ndbsql 
 
 # home
 
-find home -print | grep -v /SCCS | sort -t/
+find home -print | grep -v /SCCS 
 
 # test
 
-find test -print | grep -v /SCCS | grep -v '\.o' | grep -v test/odbc | sort -t/
+find test -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend' | grep -v test/odbc 
 
 # src
 
-find src -print | grep -v /SCCS | grep -v '\.o' | grep -v src/client/odbc | grep -v cpcc-win32 | sort -t/
+find src -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend' | grep -v src/client/odbc | grep -v cpcc-win32 
 
 # demos
 
-find demos -print | grep -v /SCCS | grep -v '\.o' | sort -t/
+find demos -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend' 
 
 # examples
 
diff --git a/ndb/config/GuessConfig.sh b/ndb/config/GuessConfig.sh
index 6cbb50a09e4..d2d8446c704 100755
--- a/ndb/config/GuessConfig.sh
+++ b/ndb/config/GuessConfig.sh
@@ -70,28 +70,40 @@ then
 TERMCAP_LIB=termcap
 fi
 
-# Allow for selecting GCC, but must be 2nd parameter
-if [ $# -gt 1 -a "$2" = "-GCC" ]
-then
-	NDB_COMPILER=GCC
-fi
+# defaults
+NDB_VERSION=DEBUG
+PACKAGE=
+VERSION=
+
+parse_arguments() {
+  for arg do
+    case "$arg" in
+      -GCC)       NDB_COMPILER=GCC ;;
+      -R)         NDB_VERSION=RELEASE ;;
+      -D)         NDB_VERSION=DEBUG ;;
+      --PACKAGE=*) PACKAGE=`echo "$arg" | sed -e "s;--PACKAGE=;;"` ;;
+      --VERSION=*) VERSION=`echo "$arg" | sed -e "s;--VERSION=;;"` ;;
+      *)
+        echo "Unknown argument '$arg'"
+        exit 1
+        ;;
+    esac
+  done
+}
+
+parse_arguments "$@"
 
 (
 	echo "# This file was automatically generated `date`"
 	echo "NDB_OS       := $NDB_OS"
 	echo "NDB_ARCH     := $NDB_ARCH"
 	echo "NDB_COMPILER := $NDB_COMPILER"
-
-	if [ $# -gt 0 -a "$1" = "-R" ]
-	then
-		echo "NDB_VERSION  := RELEASE"
-	else
-		echo "NDB_VERSION  := DEBUG"
-	fi
-
+	echo "NDB_VERSION  := $NDB_VERSION"
 	echo "NDB_SCI      := $NDB_SCI"
 	echo "NDB_ODBC     := $NDB_ODBC"
 	echo "TERMCAP_LIB  := $TERMCAP_LIB"
+	echo "PACKAGE      := $PACKAGE"
+	echo "VERSION      := $VERSION"
 ) > $NDB_TOP/config/config.mk
 
 exit 0