Lines 1-16
Link Here
|
1 |
--- Makefile.in.orig Wed Feb 2 08:22:53 2000 |
1 |
--- Makefile.in.orig Wed Feb 2 08:22:53 2000 |
2 |
+++ Makefile.in Wed May 3 09:00:00 2000 |
2 |
+++ Makefile.in Wed May 3 09:00:00 2000 |
3 |
@@ -6,7 +6,8 @@ |
3 |
@@ -7,13 +7,15 @@ |
4 |
############################################################################## |
|
|
5 |
############################################################################## |
4 |
############################################################################## |
6 |
# |
5 |
# |
7 |
-# XLSLIB -- directory for xlisp executable, startup, example, and help files |
6 |
# XLSLIB -- directory for xlisp executable, startup, example, and help files |
8 |
+# XLSLIB -- directory for xlisp example and help files |
|
|
9 |
+# XLSLIBEXEC -- directory for xlisp executable and startup |
7 |
+# XLSLIBEXEC -- directory for xlisp executable and startup |
10 |
# BINDIR -- directory for xlispstat shell script |
8 |
# BINDIR -- directory for xlispstat shell script |
11 |
# |
9 |
# |
12 |
# For the remaining parameters, if your machine has a subdirectory in the |
10 |
|
13 |
@@ -34,7 +35,8 @@ |
|
|
14 |
prefix = @prefix@ |
11 |
prefix = @prefix@ |
15 |
exec_prefix = @exec_prefix@ |
12 |
exec_prefix = @exec_prefix@ |
16 |
|
13 |
|
Lines 19-49
Link Here
|
19 |
+XLSLIBEXEC=${prefix}/libexec/xlispstat |
16 |
+XLSLIBEXEC=${prefix}/libexec/xlispstat |
20 |
BINDIR=${exec_prefix}/bin |
17 |
BINDIR=${exec_prefix}/bin |
21 |
|
18 |
|
22 |
GRAPHSYS = @GRAPHSYS@ |
19 |
SHELL = /bin/sh |
23 |
@@ -67,11 +69,11 @@ |
20 |
@@ -33,7 +35,7 @@ |
24 |
.lsp.fsl: |
|
|
25 |
echo "(compile-file \"$<\") (exit)" | ./xlisp |
26 |
|
27 |
-CFLAGS = -D${GRAPHSYS} ${UCFLAGS} ${X11INCDIR_FLAG} |
28 |
+CFLAGS = -D${GRAPHSYS} ${UCFLAGS} ${X11INCDIR_FLAG} -Dunix |
29 |
|
30 |
LIBS = ${EXTRALIBS} -lm |
21 |
LIBS = ${EXTRALIBS} -lm |
31 |
|
22 |
|
32 |
-LDFLAGS = ${ULDFLAGS} |
|
|
33 |
+LDFLAGS+= ${ULDFLAGS} |
34 |
|
35 |
OSOBJS = xsdynload.o xssystem.o unixprim.o |
36 |
|
37 |
@@ -118,7 +120,7 @@ |
38 |
compiler/assemble.fsl compiler/cmpfront.fsl |
39 |
|
40 |
xlispstat: setup.shell xlisp.wks |
23 |
xlispstat: setup.shell xlisp.wks |
41 |
- ./setup.shell xlispstat ${XLSLIB} |
24 |
- ./setup.shell xlispstat ${XLSLIB} |
42 |
+ ./setup.shell xlispstat ${XLSLIB} ${XLSLIBEXEC} |
25 |
+ ./setup.shell xlispstat ${XLSLIB} ${XLSLIBEXEC} |
43 |
chmod a+x xlispstat |
26 |
chmod a+x xlispstat |
44 |
|
27 |
|
45 |
xlisp.wks: xlisp ${CMPFSLFILES} ${FSLFILES} ${AUTOFSLFILES} |
28 |
xlisp.wks: xlisp ${LSPDIR}/xlisp.wks |
46 |
@@ -141,20 +143,21 @@ |
29 |
@@ -46,24 +48,25 @@ |
|
|
30 |
rm -f xlisp |
31 |
cp ${CDIR}/xlisp ./xlisp |
32 |
${CDIR}/xlisp: |
33 |
- (cd ${CDIR}; make xlisp) |
34 |
+ (cd ${CDIR}; ${MAKE} xlisp) |
35 |
|
47 |
install: installexecs installlsp |
36 |
install: installexecs installlsp |
48 |
|
37 |
|
49 |
installexecs: xlispstat xlisp installdirs |
38 |
installexecs: xlispstat xlisp installdirs |
Lines 52-70
Link Here
|
52 |
+ ${BSD_INSTALL_SCRIPT} xlispstat ${BINDIR}/xlispstat |
41 |
+ ${BSD_INSTALL_SCRIPT} xlispstat ${BINDIR}/xlispstat |
53 |
+ ${BSD_INSTALL_PROGRAM} xlisp ${XLSLIBEXEC} |
42 |
+ ${BSD_INSTALL_PROGRAM} xlisp ${XLSLIBEXEC} |
54 |
|
43 |
|
55 |
installlsp: xlisp.wks xlisp.hlp ${AUTOFSLFILES} ${CMPFSLFILES} installdirs |
44 |
installlsp: xlisp.wks xlisp.hlp installdirs |
56 |
- -cp xlisp.wks ${XLSLIB} |
45 |
- -cp xlisp.wks ${XLSLIB} |
57 |
- -cp xlisp.hlp ${XLSLIB} |
46 |
- -cp xlisp.hlp ${XLSLIB} |
58 |
- -cp Autoload/_autoidx.lsp Autoload/*.fsl ${XLSLIB}/Autoload |
47 |
- -cp Autoload/_autoidx.lsp Autoload/*.fsl ${XLSLIB}/Autoload |
59 |
- -cp Data/*.lsp ${XLSLIB}/Data |
48 |
- -cp Data/*.lsp ${XLSLIB}/Data |
60 |
- -cp Examples/*.lsp ${XLSLIB}/Examples |
49 |
- -cp Examples/*.lsp ${XLSLIB}/Examples |
61 |
-# -cp ${CMPFSLFILES} ${XLSLIB}/compiler |
|
|
62 |
+ ${BSD_INSTALL_SCRIPT} xlisp.wks ${XLSLIBEXEC} |
50 |
+ ${BSD_INSTALL_SCRIPT} xlisp.wks ${XLSLIBEXEC} |
63 |
+ ${BSD_INSTALL_DATA} xlisp.hlp ${XLSLIB} |
51 |
+ ${BSD_INSTALL_DATA} xlisp.hlp ${XLSLIB} |
64 |
+ ${BSD_INSTALL_DATA} Autoload/_autoidx.lsp Autoload/*.fsl ${XLSLIB}/Autoload |
52 |
+ ${BSD_INSTALL_DATA} Autoload/_autoidx.lsp Autoload/*.fsl ${XLSLIB}/Autoload |
65 |
+ ${BSD_INSTALL_DATA} Data/*.lsp ${XLSLIB}/Data |
53 |
+ ${BSD_INSTALL_DATA} Data/*.lsp ${XLSLIB}/Data |
66 |
+ ${BSD_INSTALL_DATA} Examples/*.lsp ${XLSLIB}/Examples |
54 |
+ ${BSD_INSTALL_DATA} Examples/*.lsp ${XLSLIB}/Examples |
67 |
+# ${BSD_INSTALL_DATA} ${CMPFSLFILES} ${XLSLIB}/compiler |
|
|
68 |
|
55 |
|
69 |
installdirs: |
56 |
installdirs: |
70 |
-mkdir -p ${BINDIR} |
57 |
-mkdir -p ${BINDIR} |