Skip to content

Commit a4d0c9a

Browse files
committed
make docs in immediate build dir, not in workarea
Original commit: racket/ChezScheme@a603b76
1 parent 84518b4 commit a4d0c9a

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
/xc-*/
2020
/em-*/
2121
*.*run
22-
/csug/math/csug/
22+
/csug/math/
23+
/csug/gifs/
2324
/csug/Makefile
2425
/csug/*.aux
2526
/csug/*.html
@@ -41,7 +42,9 @@
4142
/csug/libslisted*
4243
/csug/libsrecorded*
4344
/csug/*.log
44-
/release_notes/math/release_notes/
45+
/csug/primdata.ss
46+
/release_notes/math/
47+
/release_notes/gifs/
4548
/release_notes/Makefile
4649
/release_notes/*.tex
4750
/release_notes/*.aux

build.zuo

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,24 +221,25 @@
221221
;; in parallel to doc-project-names
222222
'(InstallCSUG InstallReleaseNotes))
223223
(define (targets-for-doc name install-dir-key)
224+
(define doc-dir (at-dir ".." name)) ;; ".." goes out of the workarea
224225
(define mf-in (at-source "makefiles" (~a "Makefile-" name ".in")))
225-
(define mf-out (at-dir name "Makefile"))
226+
(define mf-out (build-path doc-dir "Makefile"))
226227
(define name-sym (string->symbol name))
227228
(define (run-make target)
228229
(check-not-kernel-only)
229230
(define (->rel-shell pth)
230-
(string->shell (find-relative-path (at-dir name) pth)))
231+
(string->shell (find-relative-path doc-dir pth)))
231232
(shell/wait "make"
232233
(~a "m=" m)
233234
(~a "srcdir=" (->rel-shell (at-source name)))
234235
(~a "installdir="
235236
(->rel-shell (hash-ref config install-dir-key)))
236237
(~a "STEXLIB=" (->rel-shell stexlib))
237238
target
238-
(hash 'dir (at-dir name))))
239+
(hash 'dir doc-dir)))
239240
`([:target ,mf-out (,mf-in)
240241
,(lambda (path token)
241-
(mkdir-p (at-dir name))
242+
(mkdir-p doc-dir)
242243
(cp mf-in mf-out))]
243244
[:target ,name-sym (,mf-out
244245
,@(source-tree (at-source name))

makefiles/Makefile-csug.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ installdir=oops-missing-installdir
33
m=oops-missing-m
44
STEXLIB=oops-missing-stexlib
55
# Zuo overrides the above variables when running `make`
6-
Scheme=../bin/$m/scheme -b ../boot/$m/petite.boot -b ../boot/$m/scheme.boot
6+
Scheme=../$m/bin/$m/scheme -b ../$m/boot/$m/petite.boot -b ../$m/boot/$m/scheme.boot
77
INSTALL=$(srcdir)/../makefiles/installsh
88

99
x = csug

makefiles/Makefile-release_notes.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ installdir=oops-missing-installdir
33
m=oops-missing-m
44
STEXLIB=oops-missing-stexlib
55
# Zuo overrides the above variables when running `make`
6-
Scheme=../bin/$m/scheme -b ../boot/$m/petite.boot -b ../boot/$m/scheme.boot
6+
Scheme=../$m/bin/$m/scheme -b ../$m/boot/$m/petite.boot -b ../$m/boot/$m/scheme.boot
77
INSTALL=$(srcdir)/../makefiles/installsh
88

99
# define default document pathname here

0 commit comments

Comments
 (0)