t000-usr_prefix.diff.nope - mkports - recipes for building multiple softwares with mk(1)
(HTM) git clone git://z3bra.org/mkports
(DIR) Log
(DIR) Files
(DIR) Refs
---
t000-usr_prefix.diff.nope (27393B)
---
1 diff -urN a/cc/cc/cc.1 b/cc/cc/cc.1
2 --- a/cc/cc/cc.1 2014-12-24 10:55:32.000000000 +0100
3 +++ b/cc/cc/cc.1 2016-01-23 18:22:14.552534159 +0100
4 @@ -241,7 +241,7 @@
5 .It Fl nostartfiles
6 Do not link with the system startup files (crt0.c, etc.)
7 .It Fl nostdinc
8 -Do not use the system include paths (/usr/include, etc.)
9 +Do not use the system include paths (/include, etc.)
10 .It Fl nostdlib
11 Do not link with the system default libraries or startup files.
12 .It Fl O Ns Oo Ar level Oc
13 diff -urN a/cc/cc/cc.c b/cc/cc/cc.c
14 --- a/cc/cc/cc.c 2015-12-29 10:27:06.000000000 +0100
15 +++ b/cc/cc/cc.c 2016-01-23 18:22:14.552534159 +0100
16 @@ -190,7 +190,7 @@
17
18 /* preprocessor stuff */
19 #ifndef STDINC
20 -#define STDINC "/usr/include/"
21 +#define STDINC "/include/"
22 #endif
23 #ifdef MULTIARCH_PATH
24 #define STDINC_MA STDINC MULTIARCH_PATH "/"
25 @@ -205,7 +205,7 @@
26 #define PCCLIBDIR NULL
27 #endif
28 #ifndef LIBDIR
29 -#define LIBDIR "/usr/lib/"
30 +#define LIBDIR "/lib/"
31 #endif
32 #ifndef DEFLIBDIRS /* default library search paths */
33 #ifdef MULTIARCH_PATH
34 diff -urN a/cc/driver/platform.c b/cc/driver/platform.c
35 --- a/cc/driver/platform.c 2012-08-09 13:41:28.000000000 +0200
36 +++ b/cc/driver/platform.c 2016-01-23 18:22:14.605867491 +0100
37 @@ -204,11 +204,11 @@
38 };
39
40 static const char * const sysincdir_list_values0[] = {
41 - "=/usr/include", NULL
42 + "=/include", NULL
43 };
44 static const char * const sysincdir_list_values1[] = {
45 /* XXX fix up for libpcc? */
46 - "=/usr/lib/gcc/x86_64-linux-gnu/4.4/include", NULL
47 + "=/lib/gcc/x86_64-linux-gnu/4.4/include", NULL
48 };
49 static const struct platform_specific sysincdir_list[] = {
50 { ARCH_ANY, OS_ANY, sysincdir_list_values0 },
51 @@ -216,13 +216,13 @@
52 };
53
54 static const char * const crtdir_list_values0[] = {
55 - "=/usr/lib/i386", "=/usr/lib", NULL
56 + "=/lib/i386", "=/lib", NULL
57 };
58 static const char * const crtdir_list_values1[] = {
59 - "=/usr/lib", NULL
60 + "=/lib", NULL
61 };
62 static const char * const crtdir_list_values2[] = {
63 - "=/usr/lib64", "=/usr/lib/gcc/x86_64-linux-gnu/4.4", NULL
64 + "=/lib", "=/lib/gcc/x86_64-linux-gnu/4.4", NULL
65 };
66 static const struct platform_specific crtdir_list[] = {
67 { ARCH_I386, OS_NETBSD, crtdir_list_values0 },
68 @@ -231,7 +231,7 @@
69 };
70
71 static const char * const stdlib_list_values0[] = {
72 - "-L/usr/lib/gcc/x86_64-linux-gnu/4.4", NULL
73 + "-L/lib/gcc/x86_64-linux-gnu/4.4", NULL
74 };
75 static const char * const stdlib_list_values1[] = {
76 "-lgcc", "--as-needed", "-lgcc_s", "--no-as-needed",
77 diff -urN a/config.guess b/config.guess
78 --- a/config.guess 2014-12-17 12:20:48.000000000 +0100
79 +++ b/config.guess 2016-01-23 18:22:14.459200825 +0100
80 @@ -169,7 +169,7 @@
81 # portion of the name. We always set it to "unknown".
82 sysctl="sysctl -n hw.machine_arch"
83 UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
84 - /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
85 + /sbin/$sysctl 2>/dev/null || echo unknown)`
86 case "${UNAME_MACHINE_ARCH}" in
87 armeb) machine=armeb-unknown ;;
88 arm*) machine=arm-unknown ;;
89 @@ -238,17 +238,17 @@
90 alpha:OSF1:*:*)
91 case $UNAME_RELEASE in
92 *4.0)
93 - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
94 + UNAME_RELEASE=`/sbin/sizer -v | awk '{print $3}'`
95 ;;
96 *5.*)
97 - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
98 + UNAME_RELEASE=`/sbin/sizer -v | awk '{print $4}'`
99 ;;
100 esac
101 - # According to Compaq, /usr/sbin/psrinfo has been available on
102 + # According to Compaq, /sbin/psrinfo has been available on
103 # OSF/1 and Tru64 systems produced since 1995. I hope that
104 # covers most systems running today. This code pipes the CPU
105 # types through head -n 1, so we only detect the type of CPU 0.
106 - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
107 + ALPHA_CPU_TYPE=`/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
108 case "$ALPHA_CPU_TYPE" in
109 "EV4 (21064)")
110 UNAME_MACHINE="alpha" ;;
111 @@ -342,7 +342,7 @@
112 echo sparc-icl-nx6
113 exit ;;
114 DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
115 - case `/usr/bin/uname -p` in
116 + case `/bin/uname -p` in
117 sparc) echo sparc-icl-nx7; exit ;;
118 esac ;;
119 s390x:SunOS:*:*)
120 @@ -380,7 +380,7 @@
121 echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
122 exit ;;
123 sun4*:SunOS:*:*)
124 - case "`/usr/bin/arch -k`" in
125 + case "`/bin/arch -k`" in
126 Series*|S4*)
127 UNAME_RELEASE=`uname -v`
128 ;;
129 @@ -502,7 +502,7 @@
130 exit ;;
131 AViiON:dgux:*:*)
132 # DG/UX returns AViiON for all architectures
133 - UNAME_PROCESSOR=`/usr/bin/uname -p`
134 + UNAME_PROCESSOR=`/bin/uname -p`
135 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
136 then
137 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
138 @@ -539,15 +539,15 @@
139 echo i386-ibm-aix
140 exit ;;
141 ia64:AIX:*:*)
142 - if [ -x /usr/bin/oslevel ] ; then
143 - IBM_REV=`/usr/bin/oslevel`
144 + if [ -x /bin/oslevel ] ; then
145 + IBM_REV=`/bin/oslevel`
146 else
147 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
148 fi
149 echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
150 exit ;;
151 *:AIX:2:3)
152 - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
153 + if grep bos325 /include/stdio.h >/dev/null 2>&1; then
154 eval $set_cc_for_build
155 sed 's/^ //' << EOF >$dummy.c
156 #include <sys/systemcfg.h>
157 @@ -566,21 +566,21 @@
158 else
159 echo rs6000-ibm-aix3.2.5
160 fi
161 - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
162 + elif grep bos324 /include/stdio.h >/dev/null 2>&1; then
163 echo rs6000-ibm-aix3.2.4
164 else
165 echo rs6000-ibm-aix3.2
166 fi
167 exit ;;
168 *:AIX:*:[4567])
169 - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
170 - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
171 + IBM_CPU_ID=`/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
172 + if /sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
173 IBM_ARCH=rs6000
174 else
175 IBM_ARCH=powerpc
176 fi
177 - if [ -x /usr/bin/lslpp ] ; then
178 - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
179 + if [ -x /bin/lslpp ] ; then
180 + IBM_REV=`/bin/lslpp -Lqc bos.rte.libc |
181 awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
182 else
183 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
184 @@ -614,9 +614,9 @@
185 9000/31? ) HP_ARCH=m68000 ;;
186 9000/[34]?? ) HP_ARCH=m68k ;;
187 9000/[678][0-9][0-9])
188 - if [ -x /usr/bin/getconf ]; then
189 - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
190 - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
191 + if [ -x /bin/getconf ]; then
192 + sc_cpu_version=`/bin/getconf SC_CPU_VERSION 2>/dev/null`
193 + sc_kernel_bits=`/bin/getconf SC_KERNEL_BITS 2>/dev/null`
194 case "${sc_cpu_version}" in
195 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
196 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
197 @@ -741,7 +741,7 @@
198 echo hppa1.0-hp-osf
199 exit ;;
200 i*86:OSF1:*:*)
201 - if [ -x /usr/sbin/sysversion ] ; then
202 + if [ -x /sbin/sysversion ] ; then
203 echo ${UNAME_MACHINE}-unknown-osf1mk
204 else
205 echo ${UNAME_MACHINE}-unknown-osf1
206 @@ -810,7 +810,7 @@
207 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
208 exit ;;
209 *:FreeBSD:*:*)
210 - UNAME_PROCESSOR=`/usr/bin/uname -p`
211 + UNAME_PROCESSOR=`/bin/uname -p`
212 case ${UNAME_PROCESSOR} in
213 amd64)
214 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
215 @@ -1062,7 +1062,7 @@
216 exit ;;
217 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
218 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
219 - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
220 + if grep Novell /include/link.h >/dev/null 2>/dev/null; then
221 echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
222 else
223 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
224 @@ -1078,8 +1078,8 @@
225 echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
226 exit ;;
227 i*86:*:3.2:*)
228 - if test -f /usr/options/cb.name; then
229 - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
230 + if test -f /options/cb.name; then
231 + UNAME_REL=`sed -n 's/.*Version //p' </options/cb.name`
232 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
233 elif /bin/uname -X 2>/dev/null >/dev/null ; then
234 UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
235 @@ -1111,7 +1111,7 @@
236 echo i860-intel-osf1
237 exit ;;
238 i860:*:4.*:*) # i860-SVR4
239 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
240 + if grep Stardent /include/sys/uadmin.h >/dev/null 2>&1 ; then
241 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
242 else # Add other i860-SVR4 vendors below as they are discovered.
243 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
244 @@ -1210,7 +1210,7 @@
245 echo mips-sony-newsos6
246 exit ;;
247 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
248 - if [ -d /usr/nec ]; then
249 + if [ -d /nec ]; then
250 echo mips-nec-sysv${UNAME_RELEASE}
251 else
252 echo mips-unknown-sysv${UNAME_RELEASE}
253 @@ -1395,15 +1395,15 @@
254 uname -s = `(uname -s) 2>/dev/null || echo unknown`
255 uname -v = `(uname -v) 2>/dev/null || echo unknown`
256
257 -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
258 +/bin/uname -p = `(/bin/uname -p) 2>/dev/null`
259 /bin/uname -X = `(/bin/uname -X) 2>/dev/null`
260
261 hostinfo = `(hostinfo) 2>/dev/null`
262 /bin/universe = `(/bin/universe) 2>/dev/null`
263 -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
264 +/bin/arch -k = `(/bin/arch -k) 2>/dev/null`
265 /bin/arch = `(/bin/arch) 2>/dev/null`
266 -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
267 -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
268 +/bin/oslevel = `(/bin/oslevel) 2>/dev/null`
269 +/convex/getsysinfo = `(/convex/getsysinfo) 2>/dev/null`
270
271 UNAME_MACHINE = ${UNAME_MACHINE}
272 UNAME_RELEASE = ${UNAME_RELEASE}
273 diff -urN a/configure b/configure
274 --- a/configure 2015-12-31 17:05:19.000000000 +0100
275 +++ b/configure 2016-01-23 18:22:14.469200826 +0100
276 @@ -36,7 +36,7 @@
277 as_nl='
278 '
279 export as_nl
280 -# Printing a long string crashes Solaris 7 /usr/bin/printf.
281 +# Printing a long string crashes Solaris 7 /bin/printf.
282 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
283 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
284 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
285 @@ -50,9 +50,9 @@
286 as_echo='printf %s\n'
287 as_echo_n='printf %s'
288 else
289 - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
290 - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
291 - as_echo_n='/usr/ucb/echo -n'
292 + if test "X`(/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
293 + as_echo_body='eval /ucb/echo -n "$1$as_nl"'
294 + as_echo_n='/ucb/echo -n'
295 else
296 as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
297 as_echo_n_body='eval
298 @@ -209,7 +209,7 @@
299 else
300 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
301 as_found=false
302 -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
303 +for as_dir in /bin$PATH_SEPARATOR/bin$PATH_SEPARATOR$PATH
304 do
305 IFS=$as_save_IFS
306 test -z "$as_dir" && as_dir=.
307 @@ -568,7 +568,7 @@
308 #
309 # Initializations.
310 #
311 -ac_default_prefix=/usr/local
312 +ac_default_prefix=/local
313 ac_clean_files=
314 ac_config_libobj_dir=.
315 LIBOBJS=
316 @@ -771,7 +771,7 @@
317 sharedstatedir='${prefix}/com'
318 localstatedir='${prefix}/var'
319 includedir='${prefix}/include'
320 -oldincludedir='/usr/include'
321 +oldincludedir='/include'
322 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
323 infodir='${datarootdir}/info'
324 htmldir='${docdir}'
325 @@ -1314,7 +1314,7 @@
326 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
327 --libdir=DIR object code libraries [EPREFIX/lib]
328 --includedir=DIR C header files [PREFIX/include]
329 - --oldincludedir=DIR C header files for non-gcc [/usr/include]
330 + --oldincludedir=DIR C header files for non-gcc [/include]
331 --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
332 --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
333 --infodir=DIR info documentation [DATAROOTDIR/info]
334 @@ -1891,15 +1891,15 @@
335 uname -s = `(uname -s) 2>/dev/null || echo unknown`
336 uname -v = `(uname -v) 2>/dev/null || echo unknown`
337
338 -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
339 +/bin/uname -p = `(/bin/uname -p) 2>/dev/null || echo unknown`
340 /bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
341
342 /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
343 -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
344 -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
345 -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
346 +/bin/arch -k = `(/bin/arch -k) 2>/dev/null || echo unknown`
347 +/convex/getsysinfo = `(/convex/getsysinfo) 2>/dev/null || echo unknown`
348 +/bin/hostinfo = `(/bin/hostinfo) 2>/dev/null || echo unknown`
349 /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
350 -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
351 +/bin/oslevel = `(/bin/oslevel) 2>/dev/null || echo unknown`
352 /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
353
354 _ASUNAME
355 @@ -3123,7 +3123,7 @@
356 test -z "$as_dir" && as_dir=.
357 for ac_exec_ext in '' $ac_executable_extensions; do
358 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
359 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
360 + if test "$as_dir/$ac_word$ac_exec_ext" = "/ucb/cc"; then
361 ac_prog_rejected=yes
362 continue
363 fi
364 @@ -3997,7 +3997,7 @@
365 ac_path_GREP_found=false
366 # Loop through the user's path and test for each of PROGNAME-LIST
367 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
368 -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
369 +for as_dir in $PATH$PATH_SEPARATOR/xpg4/bin
370 do
371 IFS=$as_save_IFS
372 test -z "$as_dir" && as_dir=.
373 @@ -4039,7 +4039,7 @@
374 done
375 IFS=$as_save_IFS
376 if test -z "$ac_cv_path_GREP"; then
377 - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
378 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/xpg4/bin" "$LINENO" 5
379 fi
380 else
381 ac_cv_path_GREP=$GREP
382 @@ -4063,7 +4063,7 @@
383 ac_path_EGREP_found=false
384 # Loop through the user's path and test for each of PROGNAME-LIST
385 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
386 -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
387 +for as_dir in $PATH$PATH_SEPARATOR/xpg4/bin
388 do
389 IFS=$as_save_IFS
390 test -z "$as_dir" && as_dir=.
391 @@ -4105,7 +4105,7 @@
392 done
393 IFS=$as_save_IFS
394 if test -z "$ac_cv_path_EGREP"; then
395 - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
396 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/xpg4/bin" "$LINENO" 5
397 fi
398 else
399 ac_cv_path_EGREP=$EGREP
400 @@ -4557,14 +4557,14 @@
401 # Find a good install program. We prefer a C program (faster),
402 # so one script is as good as another. But avoid the broken or
403 # incompatible versions:
404 -# SysV /etc/install, /usr/sbin/install
405 -# SunOS /usr/etc/install
406 +# SysV /etc/install, /sbin/install
407 +# SunOS /etc/install
408 # IRIX /sbin/install
409 # AIX /bin/install
410 # AmigaOS /C/install, which installs bootblocks on floppy discs
411 -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
412 -# AFS /usr/afsws/bin/install, which mishandles nonexistent args
413 -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
414 +# AIX 4 /bin/installbsd, which doesn't work without a -g flag
415 +# AFS /afsws/bin/install, which mishandles nonexistent args
416 +# SVR4 /ucb/install, which tries to use the nonexistent group "staff"
417 # OS/2's system install, which has a completely different semantic
418 # ./install, which can be erroneously created by make from ./install.sh.
419 # Reject install programs that cannot install multiple files.
420 @@ -4582,9 +4582,9 @@
421 # Account for people who put trailing slashes in PATH elements.
422 case $as_dir/ in #((
423 ./ | .// | /[cC]/* | \
424 - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
425 + /etc/* | /sbin/* | /etc/* | /sbin/* | /afsws/bin/* | \
426 ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
427 - /usr/ucb/* ) ;;
428 + /ucb/* ) ;;
429 *)
430 # OSF1 and SCO ODT 3.0 have their own names for install.
431 # Don't use installbsd from OSF since it installs stuff as root
432 @@ -5328,7 +5328,7 @@
433 as_nl='
434 '
435 export as_nl
436 -# Printing a long string crashes Solaris 7 /usr/bin/printf.
437 +# Printing a long string crashes Solaris 7 /bin/printf.
438 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
439 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
440 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
441 @@ -5342,9 +5342,9 @@
442 as_echo='printf %s\n'
443 as_echo_n='printf %s'
444 else
445 - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
446 - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
447 - as_echo_n='/usr/ucb/echo -n'
448 + if test "X`(/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
449 + as_echo_body='eval /ucb/echo -n "$1$as_nl"'
450 + as_echo_n='/ucb/echo -n'
451 else
452 as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
453 as_echo_n_body='eval
454 diff -urN a/f77/f77/f77.1 b/f77/f77/f77.1
455 --- a/f77/f77/f77.1 2008-12-24 18:40:41.000000000 +0100
456 +++ b/f77/f77/f77.1 2016-01-23 18:22:14.609200824 +0100
457 @@ -144,16 +144,16 @@
458 `a.out'.
459 .SH FILES
460 .nf
461 -.ta \w'/usr/lib/libF77.a 'u
462 +.ta \w'/lib/libF77.a 'u
463 file.[fresc] input file
464 file.o object file
465 a.out loaded output
466 ./fort[pid].? temporary
467 -/usr/lib/f77pass1 compiler
468 +/lib/f77pass1 compiler
469 /lib/f1 pass 2
470 /lib/c2 optional optimizer
471 -/usr/lib/libF77.a intrinsic function library
472 -/usr/lib/libI77.a Fortran I/O library
473 +/lib/libF77.a intrinsic function library
474 +/lib/libI77.a Fortran I/O library
475 /lib/libc.a C library, see section 3
476 .fi
477 .SH "SEE ALSO"
478 diff -urN a/f77/f77/f77.c b/f77/f77/f77.c
479 --- a/f77/f77/f77.c 2011-08-04 10:32:32.000000000 +0200
480 +++ b/f77/f77/f77.c 2016-01-23 18:22:14.609200824 +0100
481 @@ -573,7 +573,7 @@
482 argv[argc] = 0;
483
484 s = path;
485 - t = "/usr/bin/";
486 + t = "/bin/";
487 while(*t)
488 *s++ = *t++;
489 for(t = argv[1] ; (*s++ = *t++) ; )
490 @@ -587,7 +587,7 @@
491
492 texec(path+9, argv); /* command */
493 texec(path+4, argv); /* /bin/command */
494 - texec(path , argv); /* /usr/bin/command */
495 + texec(path , argv); /* /bin/command */
496
497 fatal1("Cannot load %s",path+9);
498 }
499 diff -urN a/os/android/ccconfig.h b/os/android/ccconfig.h
500 --- a/os/android/ccconfig.h 2015-01-08 07:31:11.000000000 +0100
501 +++ b/os/android/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
502 @@ -43,7 +43,7 @@
503 #elif defined(mach_amd64)
504 #define CPPMDADD { "-D__x86_64__", "-D__x86_64", "-D__amd64__", \
505 "-D__amd64", "-D__LP64__", "-D_LP64", NULL, }
506 -#define DEFLIBDIRS { "/usr/lib64/", 0 }
507 +#define DEFLIBDIRS { "/lib/", 0 }
508 #elif defined(mach_mips)
509 #define CPPMDADD { "-D__mips__", NULL, }
510 #elif defined(mach_arm)
511 diff -urN a/os/bsd/ccconfig.h b/os/bsd/ccconfig.h
512 --- a/os/bsd/ccconfig.h 2014-03-09 10:32:58.000000000 +0100
513 +++ b/os/bsd/ccconfig.h 2016-01-23 18:22:14.469200826 +0100
514 @@ -39,7 +39,7 @@
515 #define CRTN 0
516
517 #ifdef LANG_F77
518 -#define F77LIBLIST { "-L/usr/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
519 +#define F77LIBLIST { "-L/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
520 #endif
521
522 #if defined(mach_pdp11)
523 diff -urN a/os/darwin/ccconfig.h b/os/darwin/ccconfig.h
524 --- a/os/darwin/ccconfig.h 2014-06-04 08:43:50.000000000 +0200
525 +++ b/os/darwin/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
526 @@ -50,7 +50,7 @@
527 #endif
528
529 /*
530 -ld -arch ppc -weak_reference_mismatches non-weak -o a.out -lcrt1.o -lcrt2.o -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 hello_ppc.o -lgcc -lSystemStubs -lSystem
531 +ld -arch ppc -weak_reference_mismatches non-weak -o a.out -lcrt1.o -lcrt2.o -L/lib/gcc/powerpc-apple-darwin8/4.0.1 hello_ppc.o -lgcc -lSystemStubs -lSystem
532 */
533
534 #if defined(mach_i386)
535 diff -urN a/os/dragonfly/ccconfig.h b/os/dragonfly/ccconfig.h
536 --- a/os/dragonfly/ccconfig.h 2014-12-24 09:43:28.000000000 +0100
537 +++ b/os/dragonfly/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
538 @@ -37,20 +37,20 @@
539 #define CPPADD { "-D__DragonFly__", "-D__ELF__", NULL, }
540
541 #if __DragonFly_version < 200202
542 -#define CRT0FILE "/usr/lib/gcc34/crt1.o"
543 -#define CRT0FILE_PROFILE "/usr/lib/gcc34/gcrt1.o"
544 -#define STARTFILES { "/usr/lib/gcc34/crti.o", "/usr/lib/gcc34/crtbegin.o", NULL }
545 -#define LIBCLIBS { "-lc", "-L/usr/lib/gcc34", "-lgcc", NULL }
546 -#define ENDFILES { "/usr/lib/gcc34/crtend.o", "/usr/lib/gcc34/crtn.o", NULL }
547 +#define CRT0FILE "/lib/gcc34/crt1.o"
548 +#define CRT0FILE_PROFILE "/lib/gcc34/gcrt1.o"
549 +#define STARTFILES { "/lib/gcc34/crti.o", "/lib/gcc34/crtbegin.o", NULL }
550 +#define LIBCLIBS { "-lc", "-L/lib/gcc34", "-lgcc", NULL }
551 +#define ENDFILES { "/lib/gcc34/crtend.o", "/lib/gcc34/crtn.o", NULL }
552 #else
553 -#define CRT0FILE "/usr/lib/crt1.o"
554 -#define CRT0FILE_PROFILE "/usr/lib/gcrt1.o"
555 -#define STARTFILES { "/usr/lib/crti.o", "/usr/lib/gcc41/crtbegin.o", NULL }
556 -#define LIBCLIBS { "-lc", "-L/usr/lib/gcc41", "-lgcc", NULL }
557 -#define ENDFILES { "/usr/lib/gcc41/crtend.o", "/usr/lib/crtn.o", NULL }
558 +#define CRT0FILE "/lib/crt1.o"
559 +#define CRT0FILE_PROFILE "/lib/gcrt1.o"
560 +#define STARTFILES { "/lib/crti.o", "/lib/gcc41/crtbegin.o", NULL }
561 +#define LIBCLIBS { "-lc", "-L/lib/gcc41", "-lgcc", NULL }
562 +#define ENDFILES { "/lib/gcc41/crtend.o", "/lib/crtn.o", NULL }
563 #endif
564
565 -#define DYNLINKLIB "/usr/libexec/ld-elf.so.2"
566 +#define DYNLINKLIB "/libexec/ld-elf.so.2"
567 #define STARTLABEL "_start"
568
569 #if defined(mach_i386)
570 diff -urN a/os/linux/ccconfig.h b/os/linux/ccconfig.h
571 --- a/os/linux/ccconfig.h 2014-12-24 09:43:28.000000000 +0100
572 +++ b/os/linux/ccconfig.h 2016-01-23 18:22:14.475867493 +0100
573 @@ -50,9 +50,9 @@
574 #define DYNLINKLIB "/lib64/ld-linux-x86-64.so.2"
575 #define MUSL_DYLIB "/lib/ld-musl-x86_64.so.1"
576 #ifndef MULTIARCH_PATH
577 -#define DEFLIBDIRS { "/usr/lib64/", 0 }
578 +#define DEFLIBDIRS { "/lib/", 0 }
579 #else
580 -#define DEFLIBDIRS { "/usr/lib64/", "/usr/lib/" MULTIARCH_PATH "/", 0 }
581 +#define DEFLIBDIRS { "/lib/", "/lib/" MULTIARCH_PATH "/", 0 }
582 #endif
583 #elif defined(mach_mips)
584 #define CPPMDADD { "-D__mips__", NULL, }
585 diff -urN a/os/litebsd/ccconfig.h b/os/litebsd/ccconfig.h
586 --- a/os/litebsd/ccconfig.h 2016-01-06 17:14:54.000000000 +0100
587 +++ b/os/litebsd/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
588 @@ -35,7 +35,7 @@
589 #define DYNLINKER { NULL }
590
591 #ifdef LANG_F77
592 -#define F77LIBLIST { "-L/usr/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
593 +#define F77LIBLIST { "-L/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
594 #endif
595
596 #define CPPMDADD { "-D__mips__", "-Dmips", "-D__mips=32", "-D__MIPSEL", \
597 diff -urN a/os/minix/ccconfig.h b/os/minix/ccconfig.h
598 --- a/os/minix/ccconfig.h 2014-12-24 09:43:28.000000000 +0100
599 +++ b/os/minix/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
600 @@ -77,7 +77,7 @@
601 #define STARTLABEL "crtso"
602 #define CRT0 "crtso.o"
603 #ifdef notyet
604 -#define GCRT0 "/usr/lib/pcc/gcrtso.o"
605 +#define GCRT0 "/lib/pcc/gcrtso.o"
606 #endif
607
608 #define CRTBEGIN 0
609 diff -urN a/os/mirbsd/ccconfig.h b/os/mirbsd/ccconfig.h
610 --- a/os/mirbsd/ccconfig.h 2014-12-24 09:43:28.000000000 +0100
611 +++ b/os/mirbsd/ccconfig.h 2016-01-23 18:22:14.475867493 +0100
612 @@ -35,7 +35,7 @@
613 }
614
615 /* for dynamically linked binaries */
616 -#define DYNLINKLIB "/usr/libexec/ld.so"
617 +#define DYNLINKLIB "/libexec/ld.so"
618
619 #define CRTEND_T "crtend.o"
620 #define DEFLIBS { "-lc", NULL }
621 diff -urN a/os/netbsd/ccconfig.h b/os/netbsd/ccconfig.h
622 --- a/os/netbsd/ccconfig.h 2014-12-24 09:43:29.000000000 +0100
623 +++ b/os/netbsd/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
624 @@ -35,10 +35,10 @@
625 #define CPPADD { "-D__NetBSD__", "-D__ELF__", NULL, }
626
627 #ifdef LANG_F77
628 -#define F77LIBLIST { "-L/usr/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
629 +#define F77LIBLIST { "-L/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
630 #endif
631
632 -#define DYNLINKLIB "/usr/libexec/ld.elf_so"
633 +#define DYNLINKLIB "/libexec/ld.elf_so"
634
635 #define CRTEND_T "crtend.o"
636
637 diff -urN a/os/nextstep/ccconfig.h b/os/nextstep/ccconfig.h
638 --- a/os/nextstep/ccconfig.h 2014-12-24 09:43:29.000000000 +0100
639 +++ b/os/nextstep/ccconfig.h 2016-01-23 18:22:14.475867493 +0100
640 @@ -57,7 +57,7 @@
641 #define STARTLABEL "start"
642
643 /*
644 -ld -arch ppc -weak_reference_mismatches non-weak -o a.out -lcrt1.o -lcrt2.o -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 hello_ppc.o -lgcc -lSystemStubs -lSystem
645 +ld -arch ppc -weak_reference_mismatches non-weak -o a.out -lcrt1.o -lcrt2.o -L/lib/gcc/powerpc-apple-darwin8/4.0.1 hello_ppc.o -lgcc -lSystemStubs -lSystem
646 */
647
648 #if defined(mach_i386)
649 diff -urN a/os/openbsd/ccconfig.h b/os/openbsd/ccconfig.h
650 --- a/os/openbsd/ccconfig.h 2014-12-24 09:43:29.000000000 +0100
651 +++ b/os/openbsd/ccconfig.h 2016-01-23 18:22:14.475867493 +0100
652 @@ -31,12 +31,12 @@
653
654 /* common cpp predefines */
655 #define CPPADD { "-D__OpenBSD__", "-D__ELF__", NULL, }
656 -#define DYNLINKLIB "/usr/libexec/ld.so"
657 +#define DYNLINKLIB "/libexec/ld.so"
658 #define CRTI 0 /* OpenBSD does not use this */
659 #define CRTN 0 /* OpenBSD does not use this */
660
661 #ifdef LANG_F77
662 -#define F77LIBLIST { "-L/usr/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
663 +#define F77LIBLIST { "-L/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
664 #endif
665
666 #if defined(mach_amd64)
667 diff -urN a/os/openbsd/f77config.h b/os/openbsd/f77config.h
668 --- a/os/openbsd/f77config.h 2007-09-15 09:37:49.000000000 +0200
669 +++ b/os/openbsd/f77config.h 2016-01-23 18:22:14.475867493 +0100
670 @@ -31,16 +31,16 @@
671 * Various settings that controls how the f77 compiler works.
672 */
673
674 -#define PASS1NAME "/usr/lib/f77pass1"
675 +#define PASS1NAME "/lib/f77pass1"
676 #define PASS2NAME "/lib/f1"
677 #define PASS2OPT "/lib/c2"
678 #define NOFLPASS2 "/lib/fc1"
679
680 -#define ASMNAME "/usr/bin/as"
681 -#define LDNAME "/usr/bin/ld"
682 -#define FOOTNAME "/usr/lib/crt0.o"
683 -#define PROFFOOT "/usr/lib/mcrt0.o"
684 -#define NOFLFOOT "/usr/lib/fcrt0.o"
685 -#define NOFLPROFFOOT "/usr/lib/fmcrt0.o"
686 +#define ASMNAME "/bin/as"
687 +#define LDNAME "/bin/ld"
688 +#define FOOTNAME "/lib/crt0.o"
689 +#define PROFFOOT "/lib/mcrt0.o"
690 +#define NOFLFOOT "/lib/fcrt0.o"
691 +#define NOFLPROFFOOT "/lib/fmcrt0.o"
692 #define LIBLIST { "-lF77", "-lI77", "-lm", "-lc", "-l", NULL };
693
694 diff -urN a/os/sunos/ccconfig.h b/os/sunos/ccconfig.h
695 --- a/os/sunos/ccconfig.h 2014-12-24 09:43:29.000000000 +0100
696 +++ b/os/sunos/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
697 @@ -43,12 +43,12 @@
698 #define CRTEND 0
699
700 #ifdef LANG_F77
701 -#define F77LIBLIST { "-L/usr/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
702 +#define F77LIBLIST { "-L/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
703 #endif
704
705 /* host-independent */
706 #define DYNLINKARG "-Bdynamic"
707 -#define DYNLINKLIB "/usr/lib/ld.so"
708 +#define DYNLINKLIB "/lib/ld.so"
709
710 #if defined(mach_i386)
711 #define CPPMDADD { "-D__i386__", "-D__i386", NULL, }
712 diff -urN a/os/sysv4/ccconfig.h b/os/sysv4/ccconfig.h
713 --- a/os/sysv4/ccconfig.h 2014-12-24 09:43:29.000000000 +0100
714 +++ b/os/sysv4/ccconfig.h 2016-01-23 18:22:14.472534158 +0100
715 @@ -40,11 +40,11 @@
716 #define GCRT0 "gcrt1.o"
717
718 #ifdef LANG_F77
719 -#define F77LIBLIST { "-L/usr/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
720 +#define F77LIBLIST { "-L/local/lib", "-lF77", "-lI77", "-lm", "-lc", NULL };
721 #endif
722
723 #define DYNLINKARG "--dynamic-linker"
724 -#define DYNLINKLIB "/usr/lib/ld.so.1"
725 +#define DYNLINKLIB "/lib/ld.so.1"
726
727 #if defined(mach_i386)
728 #define CPPMDADD { "-D__i386__", "-D__i386", NULL, }