summaryrefslogtreecommitdiff
path: root/shells/scsh/patches/patch-aa
blob: eb3953b5d1d818686f1dd8f921f03280bd940e41 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
$NetBSD: patch-aa,v 1.12 2011/03/19 03:58:20 obache Exp $

--- Makefile.in.orig	2006-09-03 13:12:21.000000000 +0200
+++ Makefile.in	2006-09-03 13:20:50.000000000 +0200
@@ -338,12 +338,12 @@
 	fi
 
 inst-inc:
-	$(INSTALL_DATA) $(srcdir)/c/scheme48.h $(DESTDIR)$(incdir)	
+	$(INSTALL_DATA) $(srcdir)/c/scheme48.h $(DESTDIR)$(incdir)/scsh.h
 	$(INSTALL_DATA) $(srcdir)/c/write-barrier.h $(DESTDIR)$(incdir)
 
 install-cig: cig
-	$(INSTALL_PROGRAM) $(srcdir)/$(CIG) $(DESTDIR)$(LIB)/cig
-	$(INSTALL_PROGRAM) $(srcdir)/$(CIG).image $(DESTDIR)$(LIB)/cig
+	$(BSD_INSTALL_SCRIPT) $(srcdir)/$(CIG) $(DESTDIR)$(LIB)/cig
+	$(BSD_INSTALL_SCRIPT) $(srcdir)/$(CIG).image $(DESTDIR)$(LIB)/cig
 	$(INSTALL_DATA) $(srcdir)/$(LIBCIG) $(DESTDIR)$(LIB)/cig
 	$(INSTALL_DATA) $(srcdir)/cig/libcig.h $(DESTDIR)$(LIB)/cig
 
@@ -355,6 +355,9 @@
 	done &&								\
 	for f in $(srcdir)/scheme/rts/*num.scm $(srcdir)/scheme/rts/jar-defrecord.scm; do	\
 		$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/rts || exit 1;	\
+	done &&								\
+	for f in emacs/*; do						\
+		$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/emacs || exit 1;	\
 	done 
 
 inst-doc:
@@ -419,8 +422,8 @@
 	}								\
 	done &&								\
 	for dir in								\
-		rts env big opt misc link srfi scsh doc/scsh-manual			\
-		doc/s48-manual/html doc/scsh-paper/html cig; do			\
+		emacs rts env big opt misc link srfi scsh doc/scsh-manual			\
+		doc/s48-manual/html doc/scsh-paper/html; do			\
 		{ mkdir -p $(DESTDIR)$(LIB)/$$dir && [ -w $(DESTDIR)$(LIB)/$$dir ]; } || {	\
 			echo "$(DESTDIR)$(LIB)/$$dir not a writable directory" >&2; 	\
 		exit 1;						  		\
@@ -903,9 +906,9 @@
 
 install-scsh: scsh install-scsh-image install-stripped-scsh-image
 	$(RM) $(DESTDIR)$(bindir)/$(RUNNABLE)
-	$(INSTALL_PROGRAM) scsh/scsh $(DESTDIR)$(bindir)/$(RUNNABLE)
-	$(INSTALL_PROGRAM) $(LIBSCSHVM) $(DESTDIR)$(libdir)/$(LIBSCSHVM)
-	$(INSTALL_PROGRAM) $(LIBSCSH) $(DESTDIR)$(libdir)/$(LIBSCSH)
+	$(BSD_INSTALL_SCRIPT) scsh/scsh $(DESTDIR)$(bindir)/$(RUNNABLE)
+	$(INSTALL_DATA) $(LIBSCSHVM) $(DESTDIR)$(libdir)/$(LIBSCSHVM)
+	$(INSTALL_DATA) $(LIBSCSH) $(DESTDIR)$(libdir)/$(LIBSCSH)
 	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBSCSH)
 	for f in $(srcdir)/scsh/*.scm $(srcdir)/scsh/*/*.scm; \
 	    do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/scsh/; done