aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorherbelin2002-05-16 12:14:13 +0000
committerherbelin2002-05-16 12:14:13 +0000
commit2042b6f6a98594f794a9a376c1fc866af3cedc79 (patch)
tree760589803445a92eadc277a53848e941e018332f
parentb76ce095eaf589d8b73b26e8e5cafda1db2fa473 (diff)
ARCH passe de Makefile à config.distrib
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@2701 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--distrib/Makefile3
-rwxr-xr-xdistrib/configure.distrib5
2 files changed, 5 insertions, 3 deletions
diff --git a/distrib/Makefile b/distrib/Makefile
index a32910c29a..9c0c225d85 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -2,9 +2,6 @@
sinclude config.distrib
LOCALARCH=`uname -m`
-# i.86 standardized to i386
-# MacOS X returns "Power Macintosh" - changed to "MacOS-X"
-ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/Power Macintosh/MacOS-X/'`
SYSTEM=`uname -s`
ARCHBUILDROOT=$(DISTRIBDIR)/${ARCH}
diff --git a/distrib/configure.distrib b/distrib/configure.distrib
index c27518ef55..b017b8c833 100755
--- a/distrib/configure.distrib
+++ b/distrib/configure.distrib
@@ -15,6 +15,10 @@ DATE=`grep "^DATE=" ../configure | sed -e 's/^DATE=\(.*\)/\1/'`
RELEASENUM=1
DISTRIBDIR=`pwd`
+# i.86 standardized to i386
+# MacOS X returns "Power Macintosh" - changed to "MacOS-X"
+ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/Power Macintosh/MacOS-X/'`
+
echo Default values are taken from ../configure
echo ------------------------------------------
@@ -82,6 +86,7 @@ echo DISTRIBDIR=$DISTRIBDIR >> config.distrib
echo DASHEDVERSION=$DASHEDVERSION >> config.distrib
echo MAJORVERSION=$MAJORVERSION >> config.distrib
echo RELEASENUM=$RELEASENUM >> config.distrib
+echo ARCH=$ARCH >> config.distrib
chmod +x config.distrib
# $Id$