diff options
Diffstat (limited to 'lang/scm/patches/patch-aa')
| -rw-r--r-- | lang/scm/patches/patch-aa | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/lang/scm/patches/patch-aa b/lang/scm/patches/patch-aa index de45641556c..45e4d9b8667 100644 --- a/lang/scm/patches/patch-aa +++ b/lang/scm/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2006/02/19 17:50:11 joerg Exp $ +$NetBSD: patch-aa,v 1.4 2007/08/02 14:47:25 obache Exp $ ---- Makefile.orig 2005-06-24 01:20:35.000000000 +0000 +--- Makefile.orig 2006-10-25 01:47:17.000000000 +0000 +++ Makefile @@ -44,7 +44,7 @@ SHELL = /bin/sh @@ -11,20 +11,38 @@ $NetBSD: patch-aa,v 1.3 2006/02/19 17:50:11 joerg Exp $ #LD = $(CC) -g LD = $(CC) SCMLIT = ./scmlit -@@ -97,7 +97,9 @@ ofiles = scm.o time.o repl.o scl.o sys.o - # ramap.o +@@ -86,7 +86,7 @@ srcdir.mk: Makefile + echo "srcdir=`pwd`/" >> srcdir.mk + #srcdir=$(HOME)/scm/ + #srcdir=/usr/local/src/scm/ +-include srcdir.mk ++#include srcdir.mk + + # directory where COPYING and InitXXX.scm reside. + #IMPLPATH = /usr/local/src/scm/ +@@ -110,7 +110,9 @@ ofiles = scm.o time.o repl.o scl.o sys.o + # continue-ia64.o ifiles = Init$(VERSION).scm Transcen.scm Link.scm Macro.scm Macexp.scm \ Tscript.scm compile.scm Iedline.scm Idiffer.scm -hobfiles = hobbit.scm scmhob.scm scmhob.h +hobsrcs = hobbit.scm scmhob.scm +hobincs = scmhob.h +hobfiles = $(hobsrcs) $(hobincs) + turfiles = turtlegr.c turtle grtest.scm xafiles = xatoms.scm x11.scm xevent.scm keysymdef.scm xfiles = x.c x.h xgen.scm xevent.h inc2scm $(xafiles) +@@ -249,7 +251,7 @@ libscm.opt: + echo "-F engineering-notation" >> libscm.opt + echo "-F dynamic-linking" >> libscm.opt + mylib: libscm.a +-libscm.a: libscm.opt ++libscm.a: libscm.opt scmlit + $(BUILD) -t lib -f libscm.opt + libtest: libscm.a libtest.c + $(LD) -o libtest libtest.c libscm.a -ldl -lm -lc +@@ -420,12 +422,12 @@ $(PREVDOCS)scm.info: srcdir.mk Makefile -@@ -396,12 +398,12 @@ $(PREVDOCS)scm.info: srcdir.mk Makefile - - rpm_prefix=/usr/src/redhat/ + rpm_prefix=$(HOME)/rpmbuild/ -prefix = /usr/local/ +prefix = $(PREFIX)/ @@ -37,7 +55,7 @@ $NetBSD: patch-aa,v 1.3 2006/02/19 17:50:11 joerg Exp $ # directory where `make install' will put manual page. mandir = $(prefix)man/ man1dir = $(mandir)man1/ -@@ -453,7 +455,7 @@ $(infodir)Xlibscm.info.gz: $(infodir)Xli +@@ -477,7 +479,7 @@ $(infodir)Xlibscm.info.gz: $(infodir)Xli $(infodir)hobbit.info.gz: $(infodir)hobbit.info gzip -f $(infodir)hobbit.info @@ -46,7 +64,7 @@ $NetBSD: patch-aa,v 1.3 2006/02/19 17:50:11 joerg Exp $ test -d $(bindir) || mkdir $(bindir) test -d $(mandir) || mkdir $(mandir) test -d $(man1dir) || mkdir $(man1dir) -@@ -462,16 +464,16 @@ install: scm.1 db.so wbtab.scm rwb-isam. +@@ -486,16 +488,16 @@ install: scm.1 db.so wbtab.scm rwb-isam. -cp scm.1 $(man1dir) test -d $(libdir) || mkdir $(libdir) test -d $(libscmdir) || mkdir $(libscmdir) |