sanitize binary distribution tar file name. Name now is:

root_v5.01.01.linuxicc.tar.gz
or
root_v5.01.01.linux-gcc-3.2.tar.gz
where only the version number changes and the root-config --arch output is
used to indicate the platform. Due to the many different versions of gcc
we also add the gcc version in case gcc is used. Previously we used uname
which produced wildly different results depending on the platform.


git-svn-id: http://root.cern.ch/svn/root/trunk@11758 27541ba8-7e3a-0410-8455-c3a389f83636

Makefile

@@ -211,6 +211,7 @@ endif
 ifneq ($(findstring gnu,$(COMPILER)),)
 GCC_MAJOR    := $(shell $(CXX) -dumpversion 2>&1 | cut -d'.' -f1)
 GCC_MINOR    := $(shell $(CXX) -dumpversion 2>&1 | cut -d'.' -f2)
+GCC_VERS     := gcc-$(GCC_MAJOR).$(GCC_MINOR)
 endif
 
 ##### f77 options #####
@@ -420,7 +421,7 @@ map::   $(RLIBMAP)
 dist:
 	@rm -f $(ROOTMAP)
 	@$(MAKE) map
-	@$(MAKEDIST)
+	@$(MAKEDIST) $(GCC_VERS)
 
 distsrc:
 	@$(MAKEDISTSRC)

build/unix/makedist.sh

@@ -6,14 +6,12 @@
 # Author: Fons Rademakers, 29/2/2000
 
 ROOTVERS=`cat build/version_number | sed -e 's/\//\./'`
-MACHINE=`uname`
-OSREL=`uname -r`
-if [ "x$MACHINE" = "xCYGWIN_NT-5.1" ]; then
-   TYPE=$MACHINE
+TYPE=`bin/root-config --arch`
+if [ "x$1" = "x" ]; then
+   TARFILE=root_v$ROOTVERS.$TYPE.tar
 else
-   TYPE=$MACHINE.$OSREL
+   TARFILE=root_v$ROOTVERS.$TYPE-$1.tar
 fi
-TARFILE=root_v$ROOTVERS.$TYPE.tar
 
 rm -f ../${TARFILE}.gz
 

build/win/makedist.sh

@@ -6,10 +6,7 @@
 # Author: Fons Rademakers, 29/2/2000
 
 ROOTVERS=`cat build/version_number | sed -e 's/\//\./'`
-MACHINE=`uname`
-OSREL=`uname -r`
-#TYPE=$MACHINE.$OSREL
-TYPE=win32
+TYPE=`bin/root-config --arch`
 TARFILE=root_v$ROOTVERS.$TYPE.tar
 
 TAR=/bin/tar