summaryrefslogtreecommitdiff
path: root/print/lout/files/patch-01
blob: 86a47a498687a9bf279d265b12077035d93455e1 (plain) (blame)
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
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
--- makefile.orig	Sat Oct  7 22:03:11 2000
+++ makefile	Wed Feb 14 02:03:07 2001
@@ -276,10 +276,10 @@
 # DEBUGGING = 1
 # TRACING = -g
 
-BINDIR	= /usr/staff/jeff/bin
-LIBDIR	= /usr/staff/jeff/lout.lib
-DOCDIR	= /usr/staff/jeff/lout.doc
-MANDIR	= /usr/staff/jeff/lout.man
+BINDIR	= ${PREFIX}/bin
+LIBDIR	= ${PREFIX}/share/lout
+DOCDIR	= ${PREFIX}/share/doc/lout
+MANDIR	= ${PREFIX}/man/man1
 
 LIBFONT = font
 LIBMAPS = maps
@@ -291,24 +291,24 @@
 CHARIN	= 1
 CHAROUT	= 0
 
-USELOC	= 1
+USELOC	= 0
 LOC_FR	= fr
 LOC_DE	= de
 
 COLLATE	= 1
 
-PDF_COMPRESSION	= 0
-ZLIB		=
+PDF_COMPRESSION	= 1
+ZLIB		= -lz
 ZLIBPATH	=
 
-CC	= gcc
+#CC	= gcc
 
 RCOPY	= cp -r
 
-COPTS	= -ansi -pedantic -Wall -O3
+#COPTS	= -ansi -pedantic -Wall -O3
 # COPTS	= -ansi -pedantic -Wall
 
-CFLAGS	= -DOS_UNIX=$(OSUNIX)					\
+CFLAGS	+= -DOS_UNIX=$(OSUNIX)					\
 	  -DOS_DOS=$(OSDOS)					\
 	  -DOS_MAC=$(OSMAC)					\
 	  -DDB_FIX=$(DBFIX)					\
@@ -354,42 +354,41 @@
 install: lout prg2lout
 	@echo ""
 	@echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)"
-	cp lout $(BINDIR)/lout
-	chmod 755 $(BINDIR)/lout
-	cp prg2lout $(BINDIR)/prg2lout
-	chmod 755 $(BINDIR)/prg2lout
+	install -c -s -o bin -g bin lout $(BINDIR)/lout
+	install -c -s -o bin -g bin prg2lout $(BINDIR)/prg2lout
 	@echo ""
 	@echo "(b) Installing library files into LIBDIR $(LIBDIR)"
-	mkdir $(LIBDIR)
+	-mkdir $(LIBDIR)
 	chmod 755 $(LIBDIR)
 	@echo ""
-	mkdir $(LIBDIR)/$(LIBINCL)
+	-mkdir $(LIBDIR)/$(LIBINCL)
 	chmod 755 $(LIBDIR)/$(LIBINCL)
 	cp include/* $(LIBDIR)/$(LIBINCL)
 	chmod 644 $(LIBDIR)/$(LIBINCL)/*
 	@echo ""
-	mkdir $(LIBDIR)/$(LIBDATA)
+	-mkdir $(LIBDIR)/$(LIBDATA)
 	chmod 755 $(LIBDIR)/$(LIBDATA)
 	cp data/* $(LIBDIR)/$(LIBDATA)
 	chmod 644 $(LIBDIR)/$(LIBDATA)/*
 	@echo ""
-	mkdir $(LIBDIR)/$(LIBHYPH)
+	-mkdir $(LIBDIR)/$(LIBHYPH)
 	chmod 755 $(LIBDIR)/$(LIBHYPH)
 	cp hyph/* $(LIBDIR)/$(LIBHYPH)
 	chmod 644 $(LIBDIR)/$(LIBHYPH)/*
 	@echo ""
-	mkdir $(LIBDIR)/$(LIBFONT)
+	-mkdir $(LIBDIR)/$(LIBFONT)
 	chmod 755 $(LIBDIR)/$(LIBFONT)
 	cp font/* $(LIBDIR)/$(LIBFONT)
 	chmod 644 $(LIBDIR)/$(LIBFONT)/*
 	@echo ""
-	mkdir $(LIBDIR)/$(LIBMAPS)
+	-mkdir $(LIBDIR)/$(LIBMAPS)
 	chmod 755 $(LIBDIR)/$(LIBMAPS)
 	cp maps/* $(LIBDIR)/$(LIBMAPS)
 	chmod 644 $(LIBDIR)/$(LIBMAPS)/*
 	@echo ""
-	mkdir $(LIBDIR)/$(LIBLOCA)
+	-mkdir $(LIBDIR)/$(LIBLOCA)
 	chmod 755 $(LIBDIR)/$(LIBLOCA)
+	touch $(LIBDIR)/$(LIBLOCA)/.place_holder
 	@echo ""
 	@echo "(c) Initializing run (should be silent, no errors expected)"
 	$(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init
@@ -397,6 +396,7 @@
 	@echo "(d) Changing mode of files just created by initializing run"
 	chmod 644 $(LIBDIR)/$(LIBDATA)/*
 	chmod 644 $(LIBDIR)/$(LIBHYPH)/*
+	chown -R bin:bin $(LIBDIR)
 
 installman:
 	@echo ""
@@ -405,23 +405,27 @@
 	    -e "s@<DOCDIR>@$(DOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@"	\
 	man/lout.1 > $(MANDIR)/lout.1
 	chmod 644 $(MANDIR)/lout.1
+	chown bin:bin $(MANDIR)/lout.1
 	cp man/prg2lout.1 $(MANDIR)/prg2lout.1
 	chmod 644 $(MANDIR)/prg2lout.1
+	chown bin:bin $(MANDIR)/prg2lout.1
 
 installdoc:
 	@echo ""
 	@echo "Creating DOCDIR $(DOCDIR) and copying documentation into it"
-	$(RCOPY) doc $(DOCDIR)
+	-mkdir -p $(DOCDIR)
+	$(RCOPY) doc/* $(DOCDIR)
 	chmod 755 $(DOCDIR)
 	chmod 755 $(DOCDIR)/*
 	chmod 644 $(DOCDIR)/*/*
+	chown -R bin:bin $(DOCDIR)
 
 installfr:
 	@echo ""
 	@echo "Putting French error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)"
-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
+	-mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
 	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
+	-mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
 	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
 	cp locale/msgs.fr $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
 	gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR)	\
@@ -431,9 +435,9 @@
 installde:
 	@echo ""
 	@echo "Putting German error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)"
-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
+	-mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
 	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
-	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
+	-mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
 	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
 	cp locale/msgs.de $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
 	gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE)	\