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
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
diff -Naur a/makefile b/makefile
--- a/makefile 2012-02-08 07:28:03.000000000 +0000
+++ b/makefile 2019-01-06 23:12:11.464068094 +0000
@@ -269,11 +269,11 @@
# DEBUGGING = 1
# TRACING = -g
-PREFIX = /home/jeff
+PREFIX = /usr
BINDIR = $(PREFIX)/bin
-LOUTLIBDIR = $(PREFIX)/lout.lib
-LOUTDOCDIR = $(PREFIX)/lout.doc
-MANDIR = $(PREFIX)/lout.man
+LOUTLIBDIR = $(PREFIX)/share/lout
+LOUTDOCDIR = $(PREFIX)/share/doc/lout
+MANDIR = $(PREFIX)/share/man/man1
LIBFONT = font
LIBMAPS = maps
@@ -295,11 +295,9 @@
ZLIB =
ZLIBPATH =
-CC = gcc
-
RCOPY = cp -r
-COPTS = -ansi -pedantic -Wall -O3
+COPTS += -ansi -pedantic -Wall
CFLAGS = -DOS_UNIX=$(OSUNIX) \
-DOS_DOS=$(OSDOS) \
@@ -333,7 +331,7 @@
z49.o z50.o z51.o z52.o
lout: $(OBJS)
- $(CC) -o lout $(OBJS) $(ZLIB) -lm
+ $(CC) $(COPTS) $(LDFLAGS) -o lout $(OBJS) $(ZLIB) -lm
chmod a+x lout
$(OBJS): externs.h
@@ -341,7 +339,7 @@
externs.h:
prg2lout: prg2lout.c
- $(CC) $(COPTS) -o prg2lout prg2lout.c
+ $(CC) $(COPTS) $(LDFLAGS) -o prg2lout prg2lout.c
chmod a+x prg2lout
all: lout prg2lout
@@ -355,7 +353,7 @@
chmod 755 $(BINDIR)/prg2lout
@echo ""
@echo "(b) Installing library files into LOUTLIBDIR $(LOUTLIBDIR)"
- mkdir $(LOUTLIBDIR)
+ mkdir -p $(LOUTLIBDIR)
chmod 755 $(LOUTLIBDIR)
@echo ""
mkdir $(LOUTLIBDIR)/$(LIBINCL)
@@ -386,9 +384,6 @@
mkdir $(LOUTLIBDIR)/$(LIBLOCA)
chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)
@echo ""
- @echo "(c) Initializing run (should be silent, no errors expected)"
- $(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init
- @echo ""
@echo "(d) Changing mode of files just created by initializing run"
chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
|
