Commit 7977ce35 authored by Erick Gallesio's avatar Erick Gallesio

Preparing version stklos-0.96-beta8

parent e8978e61
......@@ -21,7 +21,7 @@
;;;;
;;;; Author: Erick Gallesio [eg@unice.fr]
;;;; Creation date: 4-Jun-2000 15:07 (eg)
;;;; Last file update: 15-Jun-2007 12:09 (eg)
;;;; Last file update: 30-Jun-2007 12:02 (eg)
;;;;
;; This file defines the REPL module. This module does not export anything
......@@ -200,9 +200,9 @@ doc>
(let ((line1 (format "STklos version ~A\n" (version)))
(line2 "Copyright (C) 1999-2007 Erick Gallesio - I3S-CNRS/ESSI <eg@essi.fr>\n")
(line3 (format "[~a/~a]\n" (machine-type) (%thread-system))))
(display (do-color 'bold 'black "* " 'bold 'green line1))
(display (do-color 'bold 'black " * " 'bold 'green line2))
(display (do-color 'bold 'black "* * " 'bold 'green line3 'normal))))
(display (do-color 'bold 'black "* " 'bold 'blue line1))
(display (do-color 'bold 'black " * " 'bold 'blue line2))
(display (do-color 'bold 'black "* * " 'bold 'blue line3 'normal))))
((main-repl-hook))
......
......@@ -3,6 +3,7 @@
# Compiler
SCC=stklos-compile
SFLAGS=-c
MAKE=@MAKE@
SO=@SO@
SCOMP=@SCOMP@
......
......@@ -21,7 +21,7 @@
;;;;
;;;; Author: Erick Gallesio [eg@essi.fr]
;;;; Creation date: 15-Jan-2007 12:10 (eg)
;;;; Last file update: 29-Jun-2007 18:05 (eg)
;;;; Last file update: 30-Jun-2007 12:16 (eg)
;;;;
......@@ -44,7 +44,7 @@
;; We have a configure in a tuning
(set! objs (cons (format "~a.$(SO)" target) objs))
(printf "~a.$(SO):\n" target)
(printf "\t(cd ~a; ./configure; ~a)\n\n" tunedir (make-command)))
(printf "\t(cd ~a; ./configure; $(MAKE))\n\n" tunedir))
(else
;; A simple package
(set! objs (cons (format "~a.ostk" target) objs))
......@@ -114,6 +114,7 @@
(display
(sed make
`(("@OBJS@" ,(flat-string (reverse objs)))
("@MAKE@" ,(make-command))
("@SO@" ,(exec "stklos-config --shared-suffix"))
("@SCOMP@" ,(exec "stklos-config --compile"))
("@SLINK@" ,(exec "stklos-config --link")))))
......
......@@ -21,7 +21,7 @@
;;;;
;;;; Author: Erick Gallesio [eg@essi.fr]
;;;; Creation date: 30-May-2007 11:42 (eg)
;;;; Last file update: 29-Jun-2007 18:05 (eg)
;;;; Last file update: 30-Jun-2007 12:15 (eg)
;;;;
;; ----------------------------------------------------------------------
......@@ -62,4 +62,4 @@
;; install-packages ...
;; ----------------------------------------------------------------------
(define (install-package name dir)
(system (format "cd ~a; ~ all install" dir (make-command))))
(system (format "cd ~a; ~a all install" dir (make-command))))
......@@ -21,7 +21,7 @@
;;;;
;;;; Author: Erick Gallesio [eg@essi.fr]
;;;; Creation date: 26-Dec-2006 16:23 (eg)
;;;; Last file update: 29-Jun-2007 18:05 (eg)
;;;; Last file update: 30-Jun-2007 20:50 (eg)
;;;;
......@@ -38,7 +38,7 @@
(define stklos-pkg-cache-directory
(make-parameter (make-path (stklos-pkg-directory) "cache")))
(define (make-command)
(define make-command
(make-parameter (or (getenv "MAKE") "make")))
(define stklos-pkg-extract-dir
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment