|
1 | | -$NetBSD: patch-Makefile,v 1.1 2019/06/15 08:41:30 adam Exp $ |
| 1 | +$NetBSD: patch-Makefile,v 1.2 2025/04/28 16:16:16 tnn Exp $ |
2 | 2 |
|
3 | 3 | Do not overwrite compiler flags. |
4 | 4 | Use proper installation tools and paths. |
5 | 5 |
|
6 | | ---- Makefile.orig 2018-05-06 02:07:28.000000000 +0000 |
| 6 | +--- Makefile.orig 2022-08-04 18:46:46.107815841 +0000 |
7 | 7 | +++ Makefile |
8 | 8 | @@ -43,7 +43,6 @@ WAV49 = -DWAV49 |
9 | 9 | # CC = /usr/lang/acc |
@@ -48,7 +48,7 @@ Use proper installation tools and paths. |
48 | 48 | +DIRNAME = dirname |
49 | 49 | AR = ar |
50 | 50 | ARFLAGS = cr |
51 | | - RMFLAGS = |
| 51 | + RMFLAGS = -f |
52 | 52 | @@ -114,7 +113,6 @@ RANLIB = ranlib |
53 | 53 |
|
54 | 54 | # Local Directories |
@@ -140,68 +140,68 @@ Use proper installation tools and paths. |
140 | 140 | fi |
141 | 141 |
|
142 | 142 | gsmuninstall: |
143 | | -@@ -351,52 +358,34 @@ toastuninstall: |
| 143 | +@@ -351,53 +358,34 @@ toastuninstall: |
144 | 144 | fi |
145 | 145 |
|
146 | 146 | $(TOAST_INSTALL_BIN)/toast: $(TOAST) |
147 | | -- -rm $@ |
| 147 | +- -rm $(RMFLAGS) $@ |
148 | 148 | - cp $(TOAST) $@ |
149 | 149 | - chmod 755 $@ |
150 | 150 | + ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $? $(TOAST_INSTALL_BIN) |
151 | 151 |
|
152 | 152 | $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast |
153 | | -- -rm $@ |
154 | | -- ln $? $@ |
| 153 | +- -rm $(RMFLAGS) $@ |
| 154 | +- $(LN) $? $@ |
155 | 155 | + ${LN} -f toast $@ |
156 | 156 |
|
157 | 157 | $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast |
158 | | -- -rm $@ |
159 | | -- ln $? $@ |
| 158 | +- -rm $(RMFLAGS) $@ |
| 159 | +- $(LN) $? $@ |
160 | 160 | + ${LN} -f toast $@ |
161 | 161 |
|
162 | 162 | $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 |
163 | | -- -rm $@ |
| 163 | +- -rm $(RMFLAGS) $@ |
164 | 164 | - cp $? $@ |
165 | 165 | - chmod 444 $@ |
166 | 166 | + ${BSD_INSTALL_MAN} $? $(TOAST_INSTALL_MAN) |
167 | 167 |
|
168 | 168 | $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 |
169 | | -- -rm $@ |
| 169 | +- -rm $(RMFLAGS) $@ |
170 | 170 | - cp $? $@ |
171 | 171 | - chmod 444 $@ |
172 | 172 | + ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN) |
173 | 173 |
|
174 | 174 | $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 |
175 | | -- -rm $@ |
| 175 | +- -rm $(RMFLAGS) $@ |
176 | 176 | - cp $? $@ |
177 | 177 | - chmod 444 $@ |
178 | 178 | + ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN) |
179 | 179 |
|
180 | 180 | $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 |
181 | | -- -rm $@ |
| 181 | +- -rm $(RMFLAGS) $@ |
182 | 182 | - cp $? $@ |
183 | 183 | - chmod 444 $@ |
184 | 184 | + ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN) |
185 | 185 |
|
186 | 186 | $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 |
187 | | -- -rm $@ |
| 187 | +- -rm $(RMFLAGS) $@ |
188 | 188 | - cp $? $@ |
189 | 189 | - chmod 444 $@ |
190 | 190 | + ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN) |
191 | 191 |
|
192 | 192 | $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h |
193 | | -- -rm $@ |
| 193 | +- -rm $(RMFLAGS) $@ |
194 | 194 | - cp $? $@ |
195 | 195 | - chmod 444 $@ |
196 | 196 | - |
197 | 197 | -$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) |
198 | | -- -rm $@ |
| 198 | +- -rm $(RMFLAGS) $@ |
199 | 199 | - cp $? $@ |
200 | 200 | - chmod 444 $@ |
201 | 201 | + ${BSD_INSTALL_DATA} $? $(GSM_INSTALL_INC) |
202 | | -+ |
| 202 | + |
203 | 203 | +$(GSM_INSTALL_LIB)/libgsm.la: $(LIBGSM) |
204 | 204 | + ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $? $(GSM_INSTALL_LIB) |
205 | 205 |
|
206 | | - |
207 | 206 | # Distribution |
| 207 | + |
0 commit comments