--=-=-=
Content-Disposition: inline
Here is a patch that adds DESTDIR to revision 1.66 of Makefile.in.
BTW, is there any interest in supporting DESTDIR?
I've also attached a patch that replaces check-nargs= with protocol in
scheme/misc/annotate.scm. See <U%Dra.21905$xw4.18258@nwrdny01.gnilink.net>
in the thread "Cannot load DOODL" for more information about this.
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
filename=scsh-0.6-Makefile.in-1.66.diff
Content-Description: DESTDIR patch for revision 1.66 of Makefile.in
--- scsh-0.6/Makefile.in.orig 2003-05-04 12:37:48.000000000 +0200
+++ scsh-0.6/Makefile.in 2003-05-04 12:54:27.000000000 +0200
@@ -309,14 +309,14 @@
inst-doc install-scsh
inst-vm: $(VM)
- $(INSTALL_PROGRAM) $(VM) $(LIB)
+ $(INSTALL_PROGRAM) $(VM) $(DESTDIR)$(LIB)
inst-man:
- if [ -d $(mandir) -a -w $(mandir) ]; then \
+ if [ -d $(DESTDIR)$(mandir) -a -w $(DESTDIR)$(mandir) ]; then \
sed 's=LBIN=$(bindir)=g' doc/scsh.man | \
sed 's=LLIB=$(LIB)=g' | \
sed 's=LSCSH=$(RUNNABLE)=g' >$(MANPAGE) && \
- $(INSTALL_DATA) $(MANPAGE) $(mandir) && \
+ $(INSTALL_DATA) $(MANPAGE) $(DESTDIR)$(mandir) && \
$(RM) $(MANPAGE); \
else \
echo "$(mandir) not writable dir, not installing man page" \
@@ -324,57 +324,57 @@
fi
inst-inc:
- $(INSTALL_DATA) $(srcdir)/c/scheme48.h $(incdir)
- $(INSTALL_DATA) $(srcdir)/c/write-barrier.h $(incdir)
+ $(INSTALL_DATA) $(srcdir)/c/scheme48.h $(DESTDIR)$(incdir)
+ $(INSTALL_DATA) $(srcdir)/c/write-barrier.h $(DESTDIR)$(incdir)
inst-misc:
for stub in env big opt misc link srfi; do
\
for f in scheme/$$stub/*.scm; do \
- $(INSTALL_DATA) $$f $(LIB)/$$stub || exit 1; \
+ $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/$$stub || exit 1;
\
done; \
done && \
for f in scheme/rts/*num.scm scheme/rts/jar-defrecord.scm; do \
- $(INSTALL_DATA) $$f $(LIB)/rts || exit 1; \
+ $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/rts || exit 1; \
done
inst-doc:
for f in $(srcdir)/doc/*.txt $(srcdir)/doc/*.ps; do \
- $(INSTALL_DATA) $$f $(LIB)/doc/;
\
+ $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/;
\
done &&
\
for f in $(srcdir)/doc/src/*.tex
\
$(srcdir)/doc/src/*.dvi
\
$(srcdir)/doc/src/*.ps;
\
- do $(INSTALL_DATA) $$f $(LIB)/doc/s48-manual/;
\
+ do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/s48-manual/;
\
done &&
\
for f in $(srcdir)/doc/src/manual/*.html;
\
- do $(INSTALL_DATA) $$f $(LIB)/doc/s48-manual/html/;
\
+ do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/s48-manual/html/;
\
done &&
\
for f in $(srcdir)/doc/scsh-manual/*.tex
\
$(srcdir)/doc/scsh-manual/*.sty
\
$(srcdir)/doc/scsh-manual/*.dvi
\
$(srcdir)/doc/scsh-manual/*.ps
\
$(srcdir)/doc/scsh-manual/*.pdf;
\
- do $(INSTALL_DATA) $$f $(LIB)/doc/scsh-manual/;
\
+ do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-manual/;
\
done &&
\
for f in $(srcdir)/doc/scsh-manual/html/*.html
\
$(srcdir)/doc/scsh-manual/html/*.gif
\
$(srcdir)/doc/scsh-manual/html/*.css;
\
- do $(INSTALL_DATA) $$f $(htmldir)/;
\
+ do $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/;
\
done &&
\
for f in $(srcdir)/doc/scsh-paper/*.tex
\
$(srcdir)/doc/scsh-paper/*.sty
\
$(srcdir)/doc/scsh-paper/*.dvi
\
$(srcdir)/doc/scsh-paper/*.ps;
\
- do $(INSTALL_DATA) $$f $(LIB)/doc/scsh-paper/;
\
+ do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-paper/;
\
done &&
\
for f in $(srcdir)/doc/scsh-paper/html/*.html
\
$(srcdir)/doc/scsh-paper/html/*.css;
\
- do $(INSTALL_DATA) $$f $(LIB)/doc/scsh-paper/html;
\
+ do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-paper/html;
\
done
inst-script:
- script=$(bindir)/$(RUNNABLE) && \
+ script=$(DESTDIR)$(bindir)/$(RUNNABLE) && \
echo '#!/bin/sh' >$$script && \
echo >>$$script && \
echo 'lib=$(LIB)' >>$$script && \
@@ -393,16 +393,16 @@
dirs:
for dir in $(libdir) $(bindir) $(incdir) $(LIB) $(mandir) $(htmldir);
do\
- { mkdir -p $$dir && [ -w $$dir ]; } || { \
- echo "$$dir not a writable directory" >&2; \
+ { mkdir -p $(DESTDIR)$$dir && [ -w $(DESTDIR)$$dir ]; } || {
\
+ echo "$(DESTDIR)$$dir not a writable directory" >&2;
\
exit 1; \
} \
done && \
for dir in
\
rts env big opt misc link srfi scsh doc/scsh-manual
\
doc/s48-manual/html doc/scsh-paper/html ; do
\
- { mkdir -p $(LIB)/$$dir && [ -w $(LIB)/$$dir ]; } || {
\
- echo "$(LIB)/$$dir not a writable directory" >&2;
\
+ { mkdir -p $(DESTDIR)$(LIB)/$$dir && [ -w
$(DESTDIR)$(LIB)/$$dir ]; } || { \
+ echo "$(DESTDIR)$(LIB)/$$dir not a writable directory"
>&2; \
exit 1;
\
};
\
done
@@ -850,23 +850,23 @@
| ./$(VM) -o ./$(VM) -i $(IMAGE) -h 10000000
install-scsh: scsh install-scsh-image install-stripped-scsh-image
- $(RM) $(bindir)/$(RUNNABLE)
- $(INSTALL_PROGRAM) $(srcdir)/scsh/scsh $(bindir)/$(RUNNABLE)
- $(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSHVM) $(libdir)/$(LIBSCSHVM)
- $(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
- $(RANLIB) $(libdir)/$(LIBSCSH)
+ $(RM) $(DESTDIR)$(bindir)/$(RUNNABLE)
+ $(INSTALL_PROGRAM) $(srcdir)/scsh/scsh $(DESTDIR)$(bindir)/$(RUNNABLE)
+ $(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSHVM)
$(DESTDIR)$(libdir)/$(LIBSCSHVM)
+ $(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(DESTDIR)$(libdir)/$(LIBSCSH)
+ $(RANLIB) $(DESTDIR)$(libdir)/$(LIBSCSH)
for f in $(srcdir)/scsh/*.scm $(srcdir)/scsh/*/*.scm; \
- do $(INSTALL_DATA) $$f $(LIB)/scsh/; done
+ do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/scsh/; done
install-scsh-image: $(VM) scsh/scsh.image
( echo ',translate =scheme48 $(LIB)'; \
- echo '(dump-scsh "$(LIB)/scsh.image")'; \
+ echo '(dump-scsh "$(DESTDIR)$(LIB)/scsh.image")'; \
echo ',exit'; \
) | ./$(VM) -i scsh/scsh.image
install-stripped-scsh-image: $(VM) scsh/stripped-scsh.image
( echo ',translate =scheme48 $(LIB)'; \
- echo '(dump-scsh "$(LIB)/stripped-scsh.image")'; \
+ echo '(dump-scsh "$(DESTDIR)$(LIB)/stripped-scsh.image")';
\
echo ',exit'; \
) | ./$(VM) -i scsh/stripped-scsh.image
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=scsh-0.6-annotate.scm.diff
Content-Description: Patch that replaces check-nargs= with protocol in
scheme/misc/annotate.scm
--- scsh-0.6/scheme/misc/annotate.scm.orig 2003-05-04 13:04:02.000000000
+0200
+++ scsh-0.6/scheme/misc/annotate.scm 2003-05-04 13:04:54.000000000 +0200
@@ -7,7 +7,7 @@
(define annotate-procedure
(lap annotate-procedure ()
- 0 (check-nargs= 2)
+ 0 (protocol 2)
2 (make-env 2)
4 (local0 2)
6 (stored-object-ref closure 0)
@@ -24,7 +24,7 @@
(define procedure-annotation
(lap procedure-anotation ()
- 0 (check-nargs= 1)
+ 0 (protocol 1)
2 (make-env 1)
4 (literal '2)
6 (push)
--=-=-=--
|