Various fixes to support $(srcdir)

This commit is contained in:
mainzelm 2003-06-12 13:08:31 +00:00
parent 5de095c9dd
commit cf73c3a042
1 changed files with 7 additions and 3 deletions

View File

@ -300,7 +300,8 @@ c/fake/strerror.o: c/fake/strerror.h
$(IMAGE): $(VM) scheme/env/init-defpackage.scm scheme/more-interfaces.scm \ $(IMAGE): $(VM) scheme/env/init-defpackage.scm scheme/more-interfaces.scm \
scheme/link-packages.scm scheme/more-packages.scm \ scheme/link-packages.scm scheme/more-packages.scm \
$(usual-files) build/initial.debug build/build-usual-image $(usual-files) build/initial.debug build/build-usual-image
$(srcdir)/build/build-usual-image $(srcdir) "$(srcdir)/scheme" '$(IMAGE)' './$(VM)' \ $(srcdir)/build/build-usual-image $(srcdir) \
"`(cd $(srcdir) && echo $(PWD))`/scheme" '$(IMAGE)' './$(VM)' \
'$(INITIAL)' '$(INITIAL)'
### Fake targets: all clean install man dist ### Fake targets: all clean install man dist
@ -329,11 +330,11 @@ inst-inc:
inst-misc: inst-misc:
for stub in env big opt misc link srfi; do \ for stub in env big opt misc link srfi; do \
for f in scheme/$$stub/*.scm; do \ for f in $(srcdir)/scheme/$$stub/*.scm; do \
$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/$$stub || exit 1; \ $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/$$stub || exit 1; \
done; \ done; \
done && \ done && \
for f in scheme/rts/*num.scm scheme/rts/jar-defrecord.scm; do \ for f in $(srcdir)/scheme/rts/*num.scm $(srcdir)/scheme/rts/jar-defrecord.scm; do \
$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/rts || exit 1; \ $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/rts || exit 1; \
done done
@ -842,6 +843,7 @@ scsh/scsh.image: $(VM) $(SCHEME) $(IMAGE)
scsh/stripped-scsh.image: $(VM) $(SCHEME) $(IMAGE) scsh/stripped-scsh.image: $(VM) $(SCHEME) $(IMAGE)
(echo ",flush maps source";\ (echo ",flush maps source";\
echo ",translate =scheme48/ `pwd`/scheme/"; \ echo ",translate =scheme48/ `pwd`/scheme/"; \
echo ",translate $(srcdir)/scsh/machine/ $(srcdir)/scsh/@machine@/"; \
echo ",batch on"; \ echo ",batch on"; \
echo ",config ,load $(loads)"; \ echo ",config ,load $(loads)"; \
echo ",open $(opens)"; \ echo ",open $(opens)"; \
@ -860,12 +862,14 @@ install-scsh: scsh install-scsh-image install-stripped-scsh-image
install-scsh-image: $(VM) scsh/scsh.image install-scsh-image: $(VM) scsh/scsh.image
( echo ',translate =scheme48 $(LIB)'; \ ( echo ',translate =scheme48 $(LIB)'; \
echo ",translate $(srcdir)/scsh/machine/ $(srcdir)/scsh/@machine@/"; \
echo '(dump-scsh "$(DESTDIR)$(LIB)/scsh.image")'; \ echo '(dump-scsh "$(DESTDIR)$(LIB)/scsh.image")'; \
echo ',exit'; \ echo ',exit'; \
) | ./$(VM) -i scsh/scsh.image ) | ./$(VM) -i scsh/scsh.image
install-stripped-scsh-image: $(VM) scsh/stripped-scsh.image install-stripped-scsh-image: $(VM) scsh/stripped-scsh.image
( echo ',translate =scheme48 $(LIB)'; \ ( echo ',translate =scheme48 $(LIB)'; \
echo ",translate $(srcdir)/scsh/machine/ $(srcdir)/scsh/@machine@/"; \
echo '(dump-scsh "$(DESTDIR)$(LIB)/stripped-scsh.image")'; \ echo '(dump-scsh "$(DESTDIR)$(LIB)/stripped-scsh.image")'; \
echo ',exit'; \ echo ',exit'; \
) | ./$(VM) -i scsh/stripped-scsh.image ) | ./$(VM) -i scsh/stripped-scsh.image