From fdd1aae0c3f01f38b861fcedffa6449728fd43e0 Mon Sep 17 00:00:00 2001 From: courant Date: Thu, 19 Apr 2001 14:45:14 +0000 Subject: ajout du cas win32 git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@1631 85f007b7-540e-0410-9357-904b9bb8a0f7 --- Makefile | 1 + configure | 8 ++++---- distrib/Makefile | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5a6a1005ee..32de1f46bf 100644 --- a/Makefile +++ b/Makefile @@ -743,6 +743,7 @@ clean:: archclean rm -f tools/*.cm[io] rm -f scripts/*.cm[io] rm -f dev/*.cm[io] + rm -f */*.pp[iox] contrib/*/*.pp[iox] cleanconfig:: rm -f config/Makefile config/coq_config.ml diff --git a/configure b/configure index 3060aef34b..4f6dce2969 100755 --- a/configure +++ b/configure @@ -110,14 +110,13 @@ case $arch_spec in ARCH=`/usr/bin/arch` elif test -f /usr/ucb/arch ; then ARCH=`/usr/ucb/arch` - elif test -f /bin/uname ; then - ARCH=`/bin/uname -m` + elif /bin/uname -s | grep -q -i CYGWIN ; then + ARCH=win32 else echo "I can not automatically find the name of your architecture" echo -n\ "Give me a name, please [win32 for Win95, Win98 or WinNT]: " read ARCH - fi;; yes) ARCH=$arch esac @@ -444,7 +443,8 @@ let camlp4lib = "$CAMLP4LIB" let best = "$best_compiler" let arch = "$ARCH" let osdeplibs = "$OSDEPLIBS" -(* let defined = [ "$OSTYPE" ] *) +(* this does seem to be used any longer +let defined = [ "$OSTYPE" ] *) let version = "$VERSION" let versionsi = "$VERSIONSI" let date = "$DATE" diff --git a/distrib/Makefile b/distrib/Makefile index 0bb793b5bf..6a3cea54e5 100644 --- a/distrib/Makefile +++ b/distrib/Makefile @@ -262,6 +262,9 @@ patch-ftp-install: prep-ftp-install chmod g+w ${FTPDIR}/V${VERSION}/patch-${VERSION}-$(PREVIOUSVERSION).gz deb: - rm -rf ../debian + rm -rf ../debian ../../coq-7.0.0.orig ../../coq_7.0.0_* ../../coq_7.0.0.* + cd ../.. ; cp -a coq-7.0.0 coq-7.0.0.orig cp -a debian .. cd .. ; dpkg-buildpackage -rfakeroot -uc -us +# rm -rf ../debian + -- cgit v1.2.3