|
Lines 1-17
Link Here
|
| 1 |
--- makefile.orig Wed Aug 24 08:45:25 2005 |
1 |
--- makefile.orig Wed Aug 24 08:45:25 2005 |
| 2 |
+++ makefile Fri Oct 14 02:14:23 2005 |
2 |
+++ makefile Fri Oct 14 02:14:23 2005 |
| 3 |
@@ -259,10 +259,10 @@ |
3 |
@@ -269,11 +269,10 @@ |
| 4 |
# DEBUGGING = 1 |
4 |
# DEBUGGING = 1 |
| 5 |
# TRACING = -g |
5 |
# TRACING = -g |
| 6 |
|
6 |
|
| 7 |
-BINDIR = /home/jeff/bin |
7 |
-PREFIX = /home/jeff |
| 8 |
-LIBDIR = /home/jeff/lout.lib |
8 |
BINDIR = $(PREFIX)/bin |
| 9 |
-DOCDIR = /home/jeff/lout.doc |
9 |
-LOUTLIBDIR = $(PREFIX)/lout.lib |
| 10 |
-MANDIR = /home/jeff/lout.man |
10 |
-LOUTDOCDIR = $(PREFIX)/lout.doc |
| 11 |
+BINDIR = ${PREFIX}/bin |
11 |
-MANDIR = $(PREFIX)/lout.man |
| 12 |
+LIBDIR = ${PREFIX}/share/lout |
12 |
+LOUTLIBDIR = $(PREFIX)/share/lout |
| 13 |
+DOCDIR = ${PREFIX}/share/doc/lout |
13 |
+LOUTDOCDIR = $(PREFIX)/share/doc/lout |
| 14 |
+MANDIR = ${PREFIX}/man/man1 |
14 |
+MANDIR = $(PREFIX)/man/man1 |
| 15 |
|
15 |
|
| 16 |
LIBFONT = font |
16 |
LIBFONT = font |
| 17 |
LIBMAPS = maps |
17 |
LIBMAPS = maps |
|
Lines 57-114
Link Here
|
| 57 |
+ install -c -s -o bin -g bin lout $(BINDIR)/lout |
57 |
+ install -c -s -o bin -g bin lout $(BINDIR)/lout |
| 58 |
+ install -c -s -o bin -g bin prg2lout $(BINDIR)/prg2lout |
58 |
+ install -c -s -o bin -g bin prg2lout $(BINDIR)/prg2lout |
| 59 |
@echo "" |
59 |
@echo "" |
| 60 |
@echo "(b) Installing library files into LIBDIR $(LIBDIR)" |
60 |
@echo "(b) Installing library files into LOUTLIBDIR $(LOUTLIBDIR)" |
| 61 |
- mkdir $(LIBDIR) |
61 |
- mkdir $(LOUTLIBDIR) |
| 62 |
+ -mkdir $(LIBDIR) |
62 |
+ -mkdir $(LOUTLIBDIR) |
| 63 |
chmod 755 $(LIBDIR) |
63 |
chmod 755 $(LOUTLIBDIR) |
| 64 |
@echo "" |
64 |
@echo "" |
| 65 |
- mkdir $(LIBDIR)/$(LIBINCL) |
65 |
- mkdir $(LOUTLIBDIR)/$(LIBINCL) |
| 66 |
+ -mkdir $(LIBDIR)/$(LIBINCL) |
66 |
+ -mkdir $(LOUTLIBDIR)/$(LIBINCL) |
| 67 |
chmod 755 $(LIBDIR)/$(LIBINCL) |
67 |
chmod 755 $(LOUTLIBDIR)/$(LIBINCL) |
| 68 |
cp include/* $(LIBDIR)/$(LIBINCL) |
68 |
cp include/* $(LOUTLIBDIR)/$(LIBINCL) |
| 69 |
chmod 644 $(LIBDIR)/$(LIBINCL)/* |
69 |
chmod 644 $(LOUTLIBDIR)/$(LIBINCL)/* |
| 70 |
@echo "" |
70 |
@echo "" |
| 71 |
- mkdir $(LIBDIR)/$(LIBDATA) |
71 |
- mkdir $(LOUTLIBDIR)/$(LIBDATA) |
| 72 |
+ -mkdir $(LIBDIR)/$(LIBDATA) |
72 |
+ -mkdir $(LOUTLIBDIR)/$(LIBDATA) |
| 73 |
chmod 755 $(LIBDIR)/$(LIBDATA) |
73 |
chmod 755 $(LOUTLIBDIR)/$(LIBDATA) |
| 74 |
cp data/* $(LIBDIR)/$(LIBDATA) |
74 |
cp data/* $(LOUTLIBDIR)/$(LIBDATA) |
| 75 |
chmod 644 $(LIBDIR)/$(LIBDATA)/* |
75 |
chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/* |
| 76 |
@echo "" |
76 |
@echo "" |
| 77 |
- mkdir $(LIBDIR)/$(LIBHYPH) |
77 |
- mkdir $(LOUTLIBDIR)/$(LIBHYPH) |
| 78 |
+ -mkdir $(LIBDIR)/$(LIBHYPH) |
78 |
+ -mkdir $(LOUTLIBDIR)/$(LIBHYPH) |
| 79 |
chmod 755 $(LIBDIR)/$(LIBHYPH) |
79 |
chmod 755 $(LOUTLIBDIR)/$(LIBHYPH) |
| 80 |
cp hyph/* $(LIBDIR)/$(LIBHYPH) |
80 |
cp hyph/* $(LOUTLIBDIR)/$(LIBHYPH) |
| 81 |
chmod 644 $(LIBDIR)/$(LIBHYPH)/* |
81 |
chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/* |
| 82 |
@echo "" |
82 |
@echo "" |
| 83 |
- mkdir $(LIBDIR)/$(LIBFONT) |
83 |
- mkdir $(LOUTLIBDIR)/$(LIBFONT) |
| 84 |
+ -mkdir $(LIBDIR)/$(LIBFONT) |
84 |
+ -mkdir $(LOUTLIBDIR)/$(LIBFONT) |
| 85 |
chmod 755 $(LIBDIR)/$(LIBFONT) |
85 |
chmod 755 $(LOUTLIBDIR)/$(LIBFONT) |
| 86 |
cp font/* $(LIBDIR)/$(LIBFONT) |
86 |
cp font/* $(LOUTLIBDIR)/$(LIBFONT) |
| 87 |
chmod 644 $(LIBDIR)/$(LIBFONT)/* |
87 |
chmod 644 $(LOUTLIBDIR)/$(LIBFONT)/* |
| 88 |
@echo "" |
88 |
@echo "" |
| 89 |
- mkdir $(LIBDIR)/$(LIBMAPS) |
89 |
- mkdir $(LOUTLIBDIR)/$(LIBMAPS) |
| 90 |
+ -mkdir $(LIBDIR)/$(LIBMAPS) |
90 |
+ -mkdir $(LOUTLIBDIR)/$(LIBMAPS) |
| 91 |
chmod 755 $(LIBDIR)/$(LIBMAPS) |
91 |
chmod 755 $(LOUTLIBDIR)/$(LIBMAPS) |
| 92 |
cp maps/* $(LIBDIR)/$(LIBMAPS) |
92 |
cp maps/* $(LOUTLIBDIR)/$(LIBMAPS) |
| 93 |
chmod 644 $(LIBDIR)/$(LIBMAPS)/* |
93 |
chmod 644 $(LOUTLIBDIR)/$(LIBMAPS)/* |
| 94 |
@echo "" |
94 |
@echo "" |
| 95 |
- mkdir $(LIBDIR)/$(LIBLOCA) |
95 |
- mkdir $(LOUTLIBDIR)/$(LIBLOCA) |
| 96 |
+ -mkdir $(LIBDIR)/$(LIBLOCA) |
96 |
+ -mkdir $(LOUTLIBDIR)/$(LIBLOCA) |
| 97 |
chmod 755 $(LIBDIR)/$(LIBLOCA) |
97 |
chmod 755 $(LOUTLIBDIR)/$(LIBLOCA) |
| 98 |
+ touch $(LIBDIR)/$(LIBLOCA)/.place_holder |
98 |
+ touch $(LOUTLIBDIR)/$(LIBLOCA)/.place_holder |
| 99 |
@echo "" |
99 |
@echo "" |
| 100 |
@echo "(c) Initializing run (should be silent, no errors expected)" |
100 |
@echo "(c) Initializing run (should be silent, no errors expected)" |
| 101 |
$(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init |
101 |
$(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init |
| 102 |
@@ -379,6 +378,7 @@ |
102 |
@@ -379,6 +378,7 @@ |
| 103 |
@echo "(d) Changing mode of files just created by initializing run" |
103 |
@echo "(d) Changing mode of files just created by initializing run" |
| 104 |
chmod 644 $(LIBDIR)/$(LIBDATA)/* |
104 |
chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/* |
| 105 |
chmod 644 $(LIBDIR)/$(LIBHYPH)/* |
105 |
chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/* |
| 106 |
+ chown -R bin:bin $(LIBDIR) |
106 |
+ chown -R bin:bin $(LOUTLIBDIR) |
| 107 |
|
107 |
|
| 108 |
installman: |
108 |
installman: |
| 109 |
@echo "" |
109 |
@echo "" |
| 110 |
@@ -387,23 +387,27 @@ |
110 |
@@ -387,25 +387,29 @@ |
| 111 |
-e "s@<DOCDIR>@$(DOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@" \ |
111 |
-e "s@<LOUTDOCDIR>@$(LOUTDOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@" \ |
| 112 |
man/lout.1 > $(MANDIR)/lout.1 |
112 |
man/lout.1 > $(MANDIR)/lout.1 |
| 113 |
chmod 644 $(MANDIR)/lout.1 |
113 |
chmod 644 $(MANDIR)/lout.1 |
| 114 |
+ chown bin:bin $(MANDIR)/lout.1 |
114 |
+ chown bin:bin $(MANDIR)/lout.1 |
|
Lines 118-152
Link Here
|
| 118 |
|
118 |
|
| 119 |
installdoc: |
119 |
installdoc: |
| 120 |
@echo "" |
120 |
@echo "" |
| 121 |
@echo "Creating DOCDIR $(DOCDIR) and copying documentation into it" |
121 |
@echo "Creating LOUTDOCDIR $(LOUTDOCDIR) and copying documentation into it" |
| 122 |
- $(RCOPY) doc $(DOCDIR) |
122 |
+ -mkdir -p $(LOUTDOCDIR) |
| 123 |
+ -mkdir -p $(DOCDIR) |
123 |
$(RCOPY) doc/* $(LOUTDOCDIR) |
| 124 |
+ $(RCOPY) doc/* $(DOCDIR) |
124 |
chmod 755 $(LOUTDOCDIR) |
| 125 |
chmod 755 $(DOCDIR) |
125 |
chmod 755 $(LOUTDOCDIR)/* |
| 126 |
chmod 755 $(DOCDIR)/* |
126 |
chmod 644 $(LOUTDOCDIR)/*/* |
| 127 |
chmod 644 $(DOCDIR)/*/* |
127 |
+ chown -R bin:bin $(LOUTDOCDIR) |
| 128 |
+ chown -R bin:bin $(DOCDIR) |
128 |
|
|
|
129 |
allinstall: install installman installdoc |
| 129 |
|
130 |
|
| 130 |
installfr: |
131 |
installfr: |
| 131 |
@echo "" |
132 |
@echo "" |
| 132 |
@echo "Putting French error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)" |
133 |
@echo "Putting French error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)" |
| 133 |
- mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR) |
134 |
- mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR) |
| 134 |
+ -mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR) |
135 |
+ -mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR) |
| 135 |
chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR) |
136 |
chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR) |
| 136 |
- mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES |
137 |
- mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES |
| 137 |
+ -mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES |
138 |
+ -mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES |
| 138 |
chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES |
139 |
chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES |
| 139 |
cp locale/msgs.fr $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) |
140 |
cp locale/msgs.fr $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) |
| 140 |
gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR) \ |
141 |
gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR) \ |
| 141 |
@@ -413,9 +417,9 @@ |
142 |
@@ -413,9 +417,9 @@ |
| 142 |
installde: |
143 |
installde: |
| 143 |
@echo "" |
144 |
@echo "" |
| 144 |
@echo "Putting German error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)" |
145 |
@echo "Putting German error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)" |
| 145 |
- mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE) |
146 |
- mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE) |
| 146 |
+ -mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE) |
147 |
+ -mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE) |
| 147 |
chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE) |
148 |
chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE) |
| 148 |
- mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES |
149 |
- mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES |
| 149 |
+ -mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES |
150 |
+ -mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES |
| 150 |
chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES |
151 |
chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES |
| 151 |
cp locale/msgs.de $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) |
152 |
cp locale/msgs.de $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) |
| 152 |
gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE) \ |
153 |
gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE) \ |