summaryrefslogtreecommitdiffstats
path: root/mkimpcat.scm
diff options
context:
space:
mode:
authorThomas Bushnell <tb@debian.org>2006-10-23 23:31:59 -0700
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:35 -0800
commit906cc4f0899080f1b832af98b7ccbcc257b8a64e (patch)
tree14e3ec231debdca4da9c1a3ccc0536033c1c8a4b /mkimpcat.scm
parent3d573fa54db0fdcae8b2a20356faa46c8e335206 (diff)
parent50eb784bfcf15ee3c6b0b53d747db92673395040 (diff)
downloadscm-906cc4f0899080f1b832af98b7ccbcc257b8a64e.tar.gz
scm-906cc4f0899080f1b832af98b7ccbcc257b8a64e.zip
Import Debian changes 5e3-1debian/5e3-1
scm (5e3-1) unstable; urgency=low * New upstream release. * debian/control (Architecture): Add ia64 to list of supported archs. Now everything but s390 is listed. (Closes: #335980) (Build-Depends): Require at least version 3a4 of slib. * Change to continue.h from version 5e1-2 repeated here. * Change to xgen.scm from version 5e2-4 repeated here. * Change to scm.1 from version 5e2-4 repeated here.
Diffstat (limited to 'mkimpcat.scm')
-rw-r--r--mkimpcat.scm36
1 files changed, 25 insertions, 11 deletions
diff --git a/mkimpcat.scm b/mkimpcat.scm
index c745cfc..02d1323 100644
--- a/mkimpcat.scm
+++ b/mkimpcat.scm
@@ -1,4 +1,4 @@
-;; Copyright (C) 1993, 1994, 1995, 1997, 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
;;
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -73,7 +73,13 @@
(display " " op)
(write (cons from to) op)
(newline op))
- (define (add-source feature filename) (add-alias feature filename))
+ (define (add-source feature filename)
+ (cond ((file-exists? filename)
+ (display " " op)
+ (write (list feature 'source filename) op)
+ (newline op)
+ #t)
+ (else #f)))
(define (add-links feature usr:lib x:lib link:able-suffix)
(display* "#+" feature)
(display* "(")
@@ -120,14 +126,7 @@
(in-wb-vicinity "blkio" link:able-suffix)
(in-wb-vicinity "scan" link:able-suffix)
(usr:lib "c")))
- (add-source 'wb-table
- (in-implementation-vicinity "wbtab"))
- (add-source 'wb-table
- (in-wb-vicinity "wbtab"))
- (add-source 'rwb-isam
- (in-implementation-vicinity "rwb-isam"))
- (add-source 'rwb-isam
- (in-wb-vicinity "rwb-isam"))
+ ;; wbtab and rwb-isam moved to "Simple associations"
(add-alias 'wb 'db)))
(cond ((add-link 'mysql
(in-implementation-vicinity "database"
@@ -217,12 +216,27 @@
(add-source 'build (in-implementation-vicinity "build"))
(add-source 'compile (in-implementation-vicinity
(string-append "compile" (scheme-file-suffix))))
+ (or
+ (add-source 'wb-table
+ (in-implementation-vicinity
+ (string-append "wbtab" (scheme-file-suffix))))
+ (add-source 'wb-table
+ (in-wb-vicinity
+ (string-append "wbtab" (scheme-file-suffix)))))
+ (or
+ (add-source 'rwb-isam
+ (in-implementation-vicinity
+ (string-append "rwb-isam" (scheme-file-suffix))))
+ (add-source 'rwb-isam
+ (in-wb-vicinity
+ (string-append "rwb-isam" (scheme-file-suffix)))))
(display* ")")
)
(display* "#+" 'primitive-hygiene)
(display* "(")
- (add-source 'macro (in-implementation-vicinity "Macro"))
+ (add-source 'macro (in-implementation-vicinity
+ (string-append "Macro" (scheme-file-suffix))))
(display* ")")
(add-links 'dld