file reorg, pathnames.h, paths.h

SCCS-vsn: usr.bin/ctags/Makefile 5.5
SCCS-vsn: old/dbx/Makefile 5.15
SCCS-vsn: old/dbx/main.c 5.5
SCCS-vsn: old/dbx/makedefs.c 5.4
SCCS-vsn: usr.bin/error/Makefile 5.7
SCCS-vsn: usr.bin/error/error.h 5.4
SCCS-vsn: usr.bin/error/filter.c 5.5
SCCS-vsn: usr.bin/error/main.c 5.4
SCCS-vsn: usr.bin/error/touch.c 5.5
SCCS-vsn: usr.bin/f77/f77.tahoe/Makefile 5.2
SCCS-vsn: usr.bin/f77/f77.tahoe/f77.c 5.2
SCCS-vsn: usr.bin/f77/f77.tahoe/pathnames.h 5.2
SCCS-vsn: usr.bin/f77/pass1.tahoe/Makefile 5.2
SCCS-vsn: usr.bin/f77/pass1.tahoe/init.c 5.2
SCCS-vsn: usr.bin/f77/pass1.tahoe/lex.c 5.2
SCCS-vsn: usr.bin/f77/f77.vax/Makefile 5.2
SCCS-vsn: usr.bin/f77/f77.vax/f77.c 5.5
SCCS-vsn: usr.bin/f77/f77.vax/pathnames.h 5.2
SCCS-vsn: usr.bin/f77/pass1.vax/Makefile 5.5
SCCS-vsn: usr.bin/f77/pass1.vax/init.c 5.4
SCCS-vsn: usr.bin/f77/pass1.vax/lex.c 5.4
SCCS-vsn: old/lisp/fp/fp.vax/Makefile 4.3
SCCS-vsn: usr.bin/fpr/Makefile 5.3
SCCS-vsn: old/lisp/fp/fp.tahoe/Makefile 5.3
SCCS-vsn: usr.bin/fsplit/Makefile 5.3
SCCS-vsn: usr.bin/gcore/Makefile 5.2
SCCS-vsn: usr.bin/gprof/Makefile 5.16
SCCS-vsn: usr.bin/gprof/gprof.h 5.7
SCCS-vsn: usr.bin/gprof/printgprof.c 5.6
SCCS-vsn: old/ld/Makefile 5.2
SCCS-vsn: old/lex/Makefile 4.5
SCCS-vsn: old/lex/lmain.c 4.4
SCCS-vsn: old/lex/once.c 4.2
SCCS-vsn: old/pcc/lint/Makefile 1.24
SCCS-vsn: old/pcc/lint/lint.sh 1.9
SCCS-vsn: usr.bin/m4/Makefile 5.5
SCCS-vsn: usr.bin/m4/m4.c 1.5
SCCS-vsn: usr.bin/mkstr/Makefile 5.2
SCCS-vsn: usr.bin/nm/Makefile 5.2
SCCS-vsn: old/prof/Makefile 4.5
SCCS-vsn: old/ratfor/Makefile 5.5
SCCS-vsn: usr.bin/size/Makefile 5.2
SCCS-vsn: usr.bin/strings/Makefile 5.2
SCCS-vsn: usr.bin/strip/Makefile 5.2
SCCS-vsn: usr.bin/struct/struct/Makefile 4.7
SCCS-vsn: usr.bin/struct/struct/struct.sh 4.3
SCCS-vsn: old/yacc/Makefile 4.6
SCCS-vsn: old/yacc/files 4.2
SCCS-vsn: old/yacc/y1.c 4.2
SCCS-vsn: usr.bin/xstr/Makefile 5.2
SCCS-vsn: usr.bin/xstr/xstr.c 5.5

diff --git a/usr/src/old/dbx/Makefile b/usr/src/old/dbx/Makefile
index e78b67a..151a50c 100644 (file)
--- a/usr/src/old/dbx/Makefile
+++ b/usr/src/old/dbx/Makefile
@@ -3,7 +3,7 @@
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)Makefile    5.14 (Berkeley) %G%
+#      @(#)Makefile    5.15 (Berkeley) %G%

 #
 # make file for debugger "dbx"
 #
 #
 # make file for debugger "dbx"
 #


@@ -15,7 +15,7 @@
 
 AOUT   = tdbx
 DESTDIR        =
 
 AOUT   = tdbx
 DESTDIR        =

-DEST   = /usr/ucb/dbx
+DEST   = /usr/bin/dbx

 
 CC     = cc
 AS     = as
 
 CC     = cc
 AS     = as


@@ -133,7 +133,7 @@ SRC = \
 .s.o:
        @echo "assembling $*.s"
        @rm -f tmp
 .s.o:
        @echo "assembling $*.s"
        @rm -f tmp

-       @/lib/cpp $*.s | grep -v "^#" > tmp
+       @cpp $*.s | egrep -v "^#" > tmp

        @${AS} -o $*.o tmp
        @rm -f tmp
 
        @${AS} -o $*.o tmp
        @rm -f tmp
 

diff --git a/usr/src/old/dbx/main.c b/usr/src/old/dbx/main.c
index bf82e1e..10c40e4 100644 (file)
--- a/usr/src/old/dbx/main.c
+++ b/usr/src/old/dbx/main.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.5 (Berkeley) %G%";

 #endif not lint
 
 static char rcsid[] = "$Header: main.c,v 1.4 87/07/08 21:31:27 donn Exp $";
 #endif not lint
 
 static char rcsid[] = "$Header: main.c,v 1.4 87/07/08 21:31:27 donn Exp $";


@@ -37,6 +37,7 @@ static char rcsid[] = "$Header: main.c,v 1.4 87/07/08 21:31:27 donn Exp $";
 #include "object.h"
 #include "mappings.h"
 #include "coredump.h"
 #include "object.h"
 #include "mappings.h"
 #include "coredump.h"

+#include "pathnames.h"

 
 #ifndef public
 
 
 #ifndef public
 


@@ -232,7 +233,7 @@ String outfile;
     String tmpfile;
     extern String mktemp();
 
     String tmpfile;
     extern String mktemp();
 

-    tmpfile = mktemp("/tmp/dbxXXXX");
+    tmpfile = mktemp(_PATH_TMP);

     setout(tmpfile);
     status();
     alias(nil, nil, nil);
     setout(tmpfile);
     status();
     alias(nil, nil, nil);


@@ -411,10 +412,10 @@ private openfiles ()
     }
     if (coredump and corefile == nil) {
        if (vaddrs) {
     }
     if (coredump and corefile == nil) {
        if (vaddrs) {

-           corename = "/dev/mem";
+           corename = _PATH_MEM;

            corefile = fopen(corename, "r");
            if (corefile == nil) {
            corefile = fopen(corename, "r");
            if (corefile == nil) {

-               panic("can't open /dev/mem");
+               panic("can't open %s", _PATH_MEM);

            }
        } else {
            corename = "core";
            }
        } else {
            corename = "core";

diff --git a/usr/src/old/dbx/makedefs.c b/usr/src/old/dbx/makedefs.c
index 198f4a0..406f233 100644 (file)
--- a/usr/src/old/dbx/makedefs.c
+++ b/usr/src/old/dbx/makedefs.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)makedefs.c 5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)makedefs.c 5.4 (Berkeley) %G%";

 #endif not lint
 
 static char rcsid[] = "$Header: makedefs.c,v 1.2 87/03/26 19:14:02 donn Exp $";
 #endif not lint
 
 static char rcsid[] = "$Header: makedefs.c,v 1.2 87/03/26 19:14:02 donn Exp $";


@@ -35,6 +35,7 @@ static char rcsid[] = "$Header: makedefs.c,v 1.2 87/03/26 19:14:02 donn Exp $";
 
 #include "defs.h"
 #include <signal.h>
 
 #include "defs.h"
 #include <signal.h>

+#include "pathnames.h"

 
 #define procedure void
 
 
 #define procedure void
 


@@ -77,7 +78,7 @@ String argv[];
        if (force) {
            tmpname = argv[index + 1];
        } else {
        if (force) {
            tmpname = argv[index + 1];
        } else {

-           tmpname = mktemp("/tmp/makedefsXXXXXX");
+           tmpname = mktemp(_PATH_TMP);

        }
        tmp = freopen(tmpname, "w", stdout);
        if (tmp == nil) {
        }
        tmp = freopen(tmpname, "w", stdout);
        if (tmp == nil) {

diff --git a/usr/src/old/ld/Makefile b/usr/src/old/ld/Makefile
index 9b5b907..5fbdbe9 100644 (file)
--- a/usr/src/old/ld/Makefile
+++ b/usr/src/old/ld/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 ld ${DESTDIR}/bin
+       install -s -o bin -g bin -m 755 ld ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/old/lex/Makefile b/usr/src/old/lex/Makefile
index fb8bd13..de93162 100644 (file)
--- a/usr/src/old/lex/Makefile
+++ b/usr/src/old/lex/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    4.4 (Berkeley) %G%
+#      @(#)Makefile    4.5 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a


@@ -40,9 +40,8 @@ depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 lex ${DESTDIR}/usr/bin/lex
-       install -c -o bin -g bin -m 755 ncform ${DESTDIR}/usr/lib/lex/ncform
-       install -c -o bin -g bin -m 755 nrform ${DESTDIR}/usr/lib/lex/nrform
+       install -s -o bin -g bin -m 755 lex ${DESTDIR}/usr/bin
+       install -c -o bin -g bin -m 444 nrform ncform ${DESTDIR}/usr/share/misc

        install -c -o bin -g bin -m 755 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 755 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/old/lex/lmain.c b/usr/src/old/lex/lmain.c
index 1422f66..a9f10eb 100644 (file)
--- a/usr/src/old/lex/lmain.c
+++ b/usr/src/old/lex/lmain.c
@@ -1,7 +1,8 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)lmain.c    4.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)lmain.c    4.4 (Berkeley) %G%";

 #endif
 
 #endif
 

+# include "pathnames.h"

 # include "ldefs.c"
 # include "once.c"
 
 # include "ldefs.c"
 # include "once.c"
 


@@ -100,7 +101,7 @@ main(argc,argv)
 # ifdef DEBUG
        free3core();
 # endif
 # ifdef DEBUG
        free3core();
 # endif

-       if (ZCH>NCH) cname="/usr/lib/lex/ebcform";
+       if (ZCH>NCH) cname=_PATH_EBCFORM;

        fother = fopen(ratfor?ratname:cname,"r");
        if(fother == NULL)
                error("Lex driver missing, file %s",ratfor?ratname:cname);
        fother = fopen(ratfor?ratname:cname,"r");
        if(fother == NULL)
                error("Lex driver missing, file %s",ratfor?ratname:cname);

diff --git a/usr/src/old/lex/once.c b/usr/src/old/lex/once.c
index bd8a877..cacb08e 100644 (file)
--- a/usr/src/old/lex/once.c
+++ b/usr/src/old/lex/once.c
@@ -1,4 +1,4 @@
-/*     once.c  4.1     83/08/11        */
+/*     once.c  4.2     89/05/10        */

        /* because of external definitions, this code should occur only once */
 # ifdef ASCII
 int ctable[2*NCH] = {
        /* because of external definitions, this code should occur only once */
 # ifdef ASCII
 int ctable[2*NCH] = {


@@ -55,8 +55,8 @@ char *pushptr = pushc;
 char *slptr = slist;
 
 # if (unix || ibm)
 char *slptr = slist;
 
 # if (unix || ibm)

-char *cname = "/usr/lib/lex/ncform";
-char *ratname = "/usr/lib/lex/nrform";
+char *cname = _PATH_NCFORM;
+char *ratname = _PATH_NRFORM;

 # endif
 
 # ifdef gcos
 # endif
 
 # ifdef gcos

diff --git a/usr/src/old/lisp/fp/fp.tahoe/Makefile b/usr/src/old/lisp/fp/fp.tahoe/Makefile
index 8f31504..152c1f5 100644 (file)
--- a/usr/src/old/lisp/fp/fp.tahoe/Makefile
+++ b/usr/src/old/lisp/fp/fp.tahoe/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    5.2 (Berkeley) %G%
+#      @(#)Makefile    5.3 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install:
        mkdep -p ${CFLAGS} ${SRCS}
 
 install:

-       install -s -o bin -g bin -m 755 fp ${DESTDIR}/usr/ucb
+       install -s -o bin -g bin -m 755 fp ${DESTDIR}/usr/bin

 
 lint: ${SRCS}
        lint ${CFLAGS} ${SRCS}
 
 lint: ${SRCS}
        lint ${CFLAGS} ${SRCS}

diff --git a/usr/src/old/lisp/fp/fp.vax/Makefile b/usr/src/old/lisp/fp/fp.vax/Makefile
index 073ea8c..56776f8 100644 (file)
--- a/usr/src/old/lisp/fp/fp.vax/Makefile
+++ b/usr/src/old/lisp/fp/fp.vax/Makefile
@@ -6,7 +6,7 @@
 #  All rights reserved.  The Berkeley software License Agreement
 #  specifies the terms and conditions for redistribution.
 #
 #  All rights reserved.  The Berkeley software License Agreement
 #  specifies the terms and conditions for redistribution.
 #

-#      @(#)Makefile    4.2 (Berkeley) %G%
+#      @(#)Makefile    4.3 (Berkeley) %G%

 #
 DESTDIR =
 
 #
 DESTDIR =
 


@@ -33,8 +33,8 @@ fp:           ${FP_SYSO}
 ${FP_SYSO}:    specials.l fpMacs.o
 
 
 ${FP_SYSO}:    specials.l fpMacs.o
 
 

-install:       fp
-               install -s fp ${DESTDIR}/usr/ucb/fp
+install:
+       install -s -o bin -g bin -m 755 fp ${DESTDIR}/usr/bin

 
 clean:         
                rm -f core *.[ox] junk.fp
 
 clean:         
                rm -f core *.[ox] junk.fp

diff --git a/usr/src/old/pcc/lint/Makefile b/usr/src/old/pcc/lint/Makefile
index 2272983..ce417eb 100644 (file)
--- a/usr/src/old/pcc/lint/Makefile
+++ b/usr/src/old/pcc/lint/Makefile
@@ -1,8 +1,8 @@
 #
 #

-#      @(#)Makefile    1.23    (Berkeley)      %G%
+#      @(#)Makefile    1.24    (Berkeley)      %G%

 #
 #

-M=../../lib/mip
-P=../../lib/pcc
+M=../../libexec/mip
+P=../../libexec/pcc

 CFLAGS=-O
 LINTLIBS=llib-port.ln llib-lc.ln llib-lcurses.ln llib-ldbm.ln llib-lm.ln \
        llib-lmp.ln llib-lplot.ln llib-ltermcap.ln
 CFLAGS=-O
 LINTLIBS=llib-port.ln llib-lc.ln llib-lcurses.ln llib-ldbm.ln llib-lm.ln \
        llib-lmp.ln llib-lplot.ln llib-ltermcap.ln


@@ -102,12 +102,11 @@ lintall:
                $M/pftn.c $M/trees.c $M/optim.c lint.c
 
 install: all SHELL ${MAN}
                $M/pftn.c $M/trees.c $M/optim.c lint.c
 
 install: all SHELL ${MAN}

-       install -s -o bin -g bin -m 755 lpass1 ${DESTDIR}/usr/lib/lint/lint1
-       install -s -o bin -g bin -m 755 lpass2 ${DESTDIR}/usr/lib/lint/lint2
-       install -c -o bin -g bin -m 444 llib-* ${DESTDIR}/usr/lib/lint
-       -rm -f ${DESTDIR}/usr/lib/lint/llib-ltermlib*
-       ln -s llib-ltermcap ${DESTDIR}/usr/lib/lint/llib-ltermlib
-       ln -s llib-ltermcap.ln ${DESTDIR}/usr/lib/lint/llib-ltermlib.ln
+       install -s -o bin -g bin -m 755 lpass1 lpass2 /usr/libexec
+       install -c -o bin -g bin -m 444 llib-* /usr/libdata/lint
+       rm -f /usr/libdata/llib-ltermlib*
+       ln -s llib-ltermcap /usr/libdata/llib-ltermlib
+       ln -s llib-ltermcap.ln /usr/libdata/llib-ltermlib.ln

        install -c -o bin -g bin -m 755 SHELL ${DESTDIR}/usr/bin/lint
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
        install -c -o bin -g bin -m 755 SHELL ${DESTDIR}/usr/bin/lint
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 

diff --git a/usr/src/old/pcc/lint/lint.sh b/usr/src/old/pcc/lint/lint.sh
index 68a00d5..4147405 100644 (file)
--- a/usr/src/old/pcc/lint/lint.sh
+++ b/usr/src/old/pcc/lint/lint.sh
@@ -1,9 +1,11 @@
 #! /bin/sh
 #
 #! /bin/sh
 #

-#      @(#)lint.sh     1.8     (Berkeley)      %G%
+#      @(#)lint.sh     1.9     (Berkeley)      %G%

 #
 #

-L=/usr/lib/lint/lint T=/tmp/lint.$$ PATH=/bin:/usr/bin O="-C -Dlint"
-X= P=unix LL=/usr/lib/lint
+L=/usr/libexec/lint T=/tmp/lint.$$
+PATH=/bin:/usr/bin:/usr/pgrm
+O="-C -Dlint"
+X= P=unix LL=/usr/libdata/lint

 C=
 trap "rm -f $T; exit" 1 2 15
 for A in $*
 C=
 trap "rm -f $T; exit" 1 2 15
 for A in $*


@@ -17,15 +19,13 @@ do
        -[IDU]*)O="$O $A" ;;
        -[ORpg]*)
                ;;
        -[IDU]*)O="$O $A" ;;
        -[ORpg]*)
                ;;

-       -X)     LL=/usr/src/usr.bin/lint
-               L=/usr/src/usr.bin/lint/lpass ;;

        -*)     X="$X $A"
                case $A in
                -*n*)   P= ;;
                -*p*)   P=port ;;
                esac ;;
        *)      echo "$A:"
        -*)     X="$X $A"
                case $A in
                -*n*)   P= ;;
                -*p*)   P=port ;;
                esac ;;
        *)      echo "$A:"

-               (/lib/cpp $O $A | ${L}1 $X >>$T)2>&1
+               (cpp $O $A | ${L}1 $X >>$T)2>&1

        esac
        done
 case $P in
        esac
        done
 case $P in

diff --git a/usr/src/old/prof/Makefile b/usr/src/old/prof/Makefile
index b98e5c4..5d7c61d 100644 (file)
--- a/usr/src/old/prof/Makefile
+++ b/usr/src/old/prof/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    4.4 (Berkeley) %G%
+#      @(#)Makefile    4.5 (Berkeley) %G%

 #
 # If you don't want to plot, take out the -Dplot and the loader
 # reference to plot.a
 #
 # If you don't want to plot, take out the -Dplot and the loader
 # reference to plot.a


@@ -39,7 +39,7 @@ depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 prof ${DESTDIR}/usr/bin/prof
+       install -s -o bin -g bin -m 755 prof ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/old/ratfor/Makefile b/usr/src/old/ratfor/Makefile
index 2f25d97..be16ad1 100644 (file)
--- a/usr/src/old/ratfor/Makefile
+++ b/usr/src/old/ratfor/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    5.4 (Berkeley) %G%
+#      @(#)Makefile    5.5 (Berkeley) %G%

 #
 CFLAGS=        -O
 YFLAGS=        -d
 #
 CFLAGS=        -O
 YFLAGS=        -d


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 ratfor ${DESTDIR}/usr/bin/ratfor
+       install -s -o bin -g bin -m 755 ratfor ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/old/yacc/Makefile b/usr/src/old/yacc/Makefile
index 1240f34..8c9ca0f 100644 (file)
--- a/usr/src/old/yacc/Makefile
+++ b/usr/src/old/yacc/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    4.5 (Berkeley) %G%
+#      @(#)Makefile    4.6 (Berkeley) %G%

 #
 CFLAGS=        -O -DWORD32
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O -DWORD32
 LIBC=  /lib/libc.a


@@ -37,8 +37,8 @@ depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 yacc ${DESTDIR}/usr/bin/yacc
-       install -c -o bin -g bin -m 755 yaccpar ${DESTDIR}/usr/lib/yaccpar
+       install -s -o bin -g bin -m 755 yacc ${DESTDIR}/usr/bin
+       install -c -o bin -g bin -m 755 yaccpar ${DESTDIR}/usr/share/misc

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/old/yacc/files b/usr/src/old/yacc/files
index a5641ef..d7b8521 100644 (file)
--- a/usr/src/old/yacc/files
+++ b/usr/src/old/yacc/files
@@ -1,5 +1,5 @@
 /*
 /*

- *     @(#)files       4.1     (Berkeley)      83/02/11
+ *     @(#)files       4.2     (Berkeley)      89/05/10

  */
        /* this file has the location of the parser, and the size of the progam desired */
        /* It may also contain definitions to override various defaults: for example,
  */
        /* this file has the location of the parser, and the size of the progam desired */
        /* It may also contain definitions to override various defaults: for example,


@@ -10,8 +10,6 @@
 #ifndef WORD32
 #define WORD32
 #endif
 #ifndef WORD32
 #define WORD32
 #endif

-       /* location of the parser text file */
-# define PARSER "/usr/lib/yaccpar"

 
        /* basic size of the Yacc implementation */
 # define HUGE
 
        /* basic size of the Yacc implementation */
 # define HUGE

diff --git a/usr/src/old/yacc/y1.c b/usr/src/old/yacc/y1.c
index 58eece8..1a023d2 100644 (file)
--- a/usr/src/old/yacc/y1.c
+++ b/usr/src/old/yacc/y1.c
@@ -1,8 +1,9 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)y1.c       4.1     (Berkeley)      %G%";
+static char sccsid[] = "@(#)y1.c       4.2     (Berkeley)      %G%";

 #endif not lint
 
 # include "dextern"
 #endif not lint
 
 # include "dextern"

+# include "pathnames.h"

 
        /* variables used locally */
 
 
        /* variables used locally */
 


@@ -67,8 +68,8 @@ main(argc,argv) int argc; char *argv[]; {
 others(){ /* put out other arrays, copy the parsers */
        register c, i, j;
 
 others(){ /* put out other arrays, copy the parsers */
        register c, i, j;
 

-       finput = fopen( PARSER, "r" );
-       if( finput == NULL ) error( "cannot find parser %s", PARSER );
+       finput = fopen( _PATH_PARSER, "r" );
+       if( finput == NULL ) error( "cannot find parser %s", _PATH_PARSER);

 
        warray( "yyr1", levprd, nprod );
 
 
        warray( "yyr1", levprd, nprod );
 

diff --git a/usr/src/usr.bin/ctags/Makefile b/usr/src/usr.bin/ctags/Makefile
index c7abdf4..d740cd7 100644 (file)
--- a/usr/src/usr.bin/ctags/Makefile
+++ b/usr/src/usr.bin/ctags/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    5.4 (Berkeley) %G%
+#      @(#)Makefile    5.5 (Berkeley) %G%

 #
 DESTDIR=
 CFLAGS=-O -I.
 #
 DESTDIR=
 CFLAGS=-O -I.


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 ctags ${DESTDIR}/usr/ucb
+       install -s -o bin -g bin -m 755 ctags ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/error/Makefile b/usr/src/usr.bin/error/Makefile
index 0bc427d..3c5ebe8 100644 (file)
--- a/usr/src/usr.bin/error/Makefile
+++ b/usr/src/usr.bin/error/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    5.6 (Berkeley) %G%
+#      @(#)Makefile    5.7 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a


@@ -39,7 +39,7 @@ depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 error ${DESTDIR}/usr/ucb
+       install -s -o bin -g bin -m 755 error ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/error/error.h b/usr/src/usr.bin/error/error.h
index 2ff535e..2cf11a6 100644 (file)
--- a/usr/src/usr.bin/error/error.h
+++ b/usr/src/usr.bin/error/error.h
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)error.h     5.3 (Berkeley) %G%
+ *     @(#)error.h     5.4 (Berkeley) %G%

  */
 
 typedef        int     boolean;
  */
 
 typedef        int     boolean;


@@ -151,10 +151,6 @@ extern struct lang_desc lang_table[];
  *     be touched, or if the function reference is to a
  *     function the user doesn't want recorded.
  */
  *     be touched, or if the function reference is to a
  *     function the user doesn't want recorded.
  */

-#define        IG_FILE1        "llib-lc"
-#define        IG_FILE2        "llib-port"
-#define        IG_FILE3        "/usr/lib/llib-lc"
-#define        IG_FILE4        "/usr/lib/llib-port"

 
 #define        ERRORNAME       "/.errorrc"
 int    nignored;
 
 #define        ERRORNAME       "/.errorrc"
 int    nignored;

diff --git a/usr/src/usr.bin/error/filter.c b/usr/src/usr.bin/error/filter.c
index 6bbb422..f5a17da 100644 (file)
--- a/usr/src/usr.bin/error/filter.c
+++ b/usr/src/usr.bin/error/filter.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)filter.c   5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)filter.c   5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -24,6 +24,7 @@ static char sccsid[] = "@(#)filter.c  5.4 (Berkeley) %G%";
 #include <ctype.h>
 #include <pwd.h>
 #include "error.h"
 #include <ctype.h>
 #include <pwd.h>
 #include "error.h"

+#include "pathnames.h"

 
 char   *lint_libs[] = {
        IG_FILE1,
 
 char   *lint_libs[] = {
        IG_FILE1,

diff --git a/usr/src/usr.bin/error/main.c b/usr/src/usr.bin/error/main.c
index 54924f6..10b68a9 100644 (file)
--- a/usr/src/usr.bin/error/main.c
+++ b/usr/src/usr.bin/error/main.c
@@ -22,17 +22,18 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.4 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
 #include "error.h"
 #endif /* not lint */
 
 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
 #include "error.h"

+#include "pathnames.h"

 
 int    nerrors = 0;
 Eptr   er_head;
 
 int    nerrors = 0;
 Eptr   er_head;

-Eptr   *errors;        
+Eptr   *errors;

 
 int    nfiles = 0;
 Eptr   **files;        /* array of pointers into errors*/
 
 int    nfiles = 0;
 Eptr   **files;        /* array of pointers into errors*/


@@ -40,7 +41,7 @@ int   language = INCC;
 
 char   *currentfilename = "????";
 char   *processname;
 
 char   *currentfilename = "????";
 char   *processname;

-char   im_on[] = "/dev/tty";   /* my tty name */
+char   im_on[] = _PATH_TTY;    /* my tty name */

 
 boolean        query = FALSE;          /* query the operator if touch files */
 boolean        notouch = FALSE;        /* don't touch ANY files */
 
 boolean        query = FALSE;          /* query the operator if touch files */
 boolean        notouch = FALSE;        /* don't touch ANY files */

diff --git a/usr/src/usr.bin/error/touch.c b/usr/src/usr.bin/error/touch.c
index 1d183d8..86122b5 100644 (file)
--- a/usr/src/usr.bin/error/touch.c
+++ b/usr/src/usr.bin/error/touch.c
@@ -16,15 +16,16 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)touch.c    5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)touch.c    5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-#include <stdio.h>
-#include <ctype.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>

-#include <signal.h>
+#include <sys/signal.h>
+#include <stdio.h>
+#include <ctype.h>

 #include "error.h"
 #include "error.h"

+#include "pathnames.h"

 
 /*
  *     Iterate through errors
 
 /*
  *     Iterate through errors


@@ -495,7 +496,7 @@ FILE        *o_touchedfile; /* the old file */
 FILE   *n_touchedfile; /* the new file */
 char   *o_name;
 char   n_name[64];
 FILE   *n_touchedfile; /* the new file */
 char   *o_name;
 char   n_name[64];

-char   *canon_name = "/tmp/ErrorXXXXXX";
+char   *canon_name = _PATH_TMP;

 int    o_lineno;
 int    n_lineno;
 boolean        tempfileopen = FALSE;
 int    o_lineno;
 int    n_lineno;
 boolean        tempfileopen = FALSE;

diff --git a/usr/src/usr.bin/f77/f77.tahoe/Makefile b/usr/src/usr.bin/f77/f77.tahoe/Makefile
index 38182e4..f586cef 100644 (file)
--- a/usr/src/usr.bin/f77/f77.tahoe/Makefile
+++ b/usr/src/usr.bin/f77/f77.tahoe/Makefile
@@ -9,7 +9,7 @@
 # software without specific prior written permission. This software
 # is provided ``as is'' without express or implied warranty.
 #
 # software without specific prior written permission. This software
 # is provided ``as is'' without express or implied warranty.
 #

-#      @(#)Makefile    5.1 (Berkeley) %G%
+#      @(#)Makefile    5.2 (Berkeley) %G%

 #
 CFLAGS=        -DHERE=TAHOE -DTARGET=TAHOE -DFAMILY=PCC -DUCBVAXASM \
        -DUCBPASS2 -O -I$(INCLDIR)/usr/include -I../include
 #
 CFLAGS=        -DHERE=TAHOE -DTARGET=TAHOE -DFAMILY=PCC -DUCBVAXASM \
        -DUCBPASS2 -O -I$(INCLDIR)/usr/include -I../include


@@ -22,32 +22,20 @@ all: f77
 f77: ${SRCS} ${LIBC}
        ${CC} -o $@ ${CFLAGS} ${SRCS}
 
 f77: ${SRCS} ${LIBC}
        ${CC} -o $@ ${CFLAGS} ${SRCS}
 

-clean: FRC
+clean:

        rm -f ${OBJS} core f77
 
        rm -f ${OBJS} core f77
 

-depend: FRC
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}

        mkdep -p ${CFLAGS} ${SRCS}
 
        mkdep -p ${CFLAGS} ${SRCS}
 

-install: FRC
-       install -s -o bin -g bin -m 755 f77 ${DESTDIR}/usr/bin/f77
+install: ${MAN}
+       install -s -o bin -g bin -m 755 f77 ${DESTDIR}/usr/bin

 
 

-lint: FRC
+lint: ${SRCS}

        lint ${CFLAGS} ${SRCS}
 
        lint ${CFLAGS} ${SRCS}
 

-tags: FRC
+tags: ${SRCS}

        ctags ${SRCS}
        ctags ${SRCS}

-
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-f77: f77.c /usr/include/stdio.h /usr/include/sys/types.h
-f77: /usr/include/sys/stat.h /usr/include/ctype.h /usr/include/signal.h
-f77: /usr/include/machine/trap.h /usr/include/sys/time.h /usr/include/time.h
-f77: /usr/include/sys/resource.h /usr/include/sys/wait.h
-f77: /usr/include/machine/machparam.h ../include/defines.h
-f77: ../include/machdefs.h drivedefs.h ../include/version.h
-f77: /usr/include/errno.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/usr/src/usr.bin/f77/f77.tahoe/f77.c b/usr/src/usr.bin/f77/f77.tahoe/f77.c
index 3528a03..96c6b38 100644 (file)
--- a/usr/src/usr.bin/f77/f77.tahoe/f77.c
+++ b/usr/src/usr.bin/f77/f77.tahoe/f77.c
@@ -79,7 +79,7 @@ char *xxxvers[] = "\n@(#) F77 DRIVER, VERSION 4.2,   1984 JULY 28\n";
 
 #include "defines.h"
 #include "machdefs.h"
 
 #include "defines.h"
 #include "machdefs.h"

-#include "drivedefs.h"
+#include "pathnames.h"

 #include "version.h"
 
 static FILEP diagfile  = {stderr} ;
 #include "version.h"
 
 static FILEP diagfile  = {stderr} ;


@@ -97,8 +97,8 @@ static char *ldname   = LDNAME ;
 static char *footname  = FOOTNAME;
 static char *proffoot  = PROFFOOT;
 static char *macroname = "m4";
 static char *footname  = FOOTNAME;
 static char *proffoot  = PROFFOOT;
 static char *macroname = "m4";

-static char *shellname = "/bin/sh";
-static char *cppname   = "/lib/cpp";
+static char *shellname = _PATH_BSHELL;
+static char *cppname   = _PATH_CPP;

 static char *aoutname  = "a.out" ;
 static char *temppref  = TEMPPREF;
 
 static char *aoutname  = "a.out" ;
 static char *temppref  = TEMPPREF;
 


@@ -860,7 +860,7 @@ sys(str)
 char *str;
 {
 register char *s, *t;
 char *str;
 {
 register char *s, *t;

-char *argv[100], path[100];
+char *argv[100];

 char *inname, *outname;
 int append;
 int waitpid;
 char *inname, *outname;
 int append;
 int waitpid;


@@ -909,12 +909,6 @@ if(argc == 1)   /* no command */
        return(-1);
 argv[argc] = 0;
 
        return(-1);
 argv[argc] = 0;
 

-s = path;
-t = "/usr/bin/";
-while(*t)
-       *s++ = *t++;
-for(t = argv[1] ; *s++ = *t++ ; )
-       ;

 if((waitpid = fork()) == 0)
        {
        if(inname)
 if((waitpid = fork()) == 0)
        {
        if(inname)


@@ -923,11 +917,9 @@ if((waitpid = fork()) == 0)
                freopen(outname, (append ? "a" : "w"), stdout);
        enbint(SIG_DFL);
 
                freopen(outname, (append ? "a" : "w"), stdout);
        enbint(SIG_DFL);
 

-       texec(path+9, argv);  /* command */
-       texec(path+4, argv);  /*  /bin/command */
-       texec(path  , argv);  /* /usr/bin/command */
+       texec(argv[1]  , argv);

 
 

-       fatalstr("Cannot load %s",path+9);
+       fatalstr("Cannot load %s", argv[1]);

        }
 
 return( await(waitpid) );
        }
 
 return( await(waitpid) );


@@ -1185,7 +1177,7 @@ if(fn!=NULL && *fn!='\0')
 LOCAL fname(name, suff)
 char *name, *suff;
 {
 LOCAL fname(name, suff)
 char *name, *suff;
 {

-sprintf(name, "/tmp/%s%d.%s", temppref, pid, suff);
+sprintf(name, "%s/%s%d.%s", _PATH_TMP, temppref, pid, suff);

 }
 
 
 }
 
 

diff --git a/usr/src/usr.bin/f77/f77.tahoe/pathnames.h b/usr/src/usr.bin/f77/f77.tahoe/pathnames.h
index 8cba4c1..f434baf 100644 (file)
--- a/usr/src/usr.bin/f77/f77.tahoe/pathnames.h
+++ b/usr/src/usr.bin/f77/f77.tahoe/pathnames.h
@@ -22,26 +22,27 @@
        Wrong Definitions File!
 #endif
 
        Wrong Definitions File!
 #endif
 

-#define PASS1NAME      "/usr/lib/f77pass1"
-#define PASS2NAME      "/lib/f1"
+#define        PASS1NAME       "/usr/libexec/f77pass1"
+#define        PASS2NAME       "/usr/libexec/f1"

 #ifdef INLINE
 #ifdef INLINE

-#define        PASS2INAME      "/usr/lib/if1"
-#endif INLINE
-#define PASS2OPT       "/lib/c2"
-#define ASMNAME                "/bin/as"
-#define LDNAME         "/bin/ld"
+#define        PASS2INAME      "/usr/libexec/if1"
+#endif
+#define        PASS2OPT        "/usr/libexec/c2"
+#define        ASMNAME         "/usr/bin/as"
+#define        LDNAME          "/usr/bin/ld"
+#define        _PATH_UBIN      "/usr/bin"

 #define        CATNAME         "/bin/cat"
 #define        CATNAME         "/bin/cat"

-#define FOOTNAME       "/lib/crt0.o"
-#define PROFFOOT       "/lib/mcrt0.o"
+#define FOOTNAME       "/usr/lib/crt0.o"
+#define        PROFFOOT        "/usr/lib/mcrt0.o"

 #define        GPRFFOOT        "/usr/lib/gcrt0.o"
 #define        GPRFFOOT        "/usr/lib/gcrt0.o"

-#define TEMPPREF       "fort"
+#define        TEMPPREF        "fort"

 
 static char *liblist [ ] =
                { "/usr/lib/libU77.a", 
                  "/usr/lib/libF77.a", 
                  "/usr/lib/libI77.a", 
                  "/usr/lib/libm.a", 
 
 static char *liblist [ ] =
                { "/usr/lib/libU77.a", 
                  "/usr/lib/libF77.a", 
                  "/usr/lib/libI77.a", 
                  "/usr/lib/libm.a", 

-                 "/lib/libc.a",NULL };
+                 "/usr/lib/libc.a",NULL };

 static char *p_liblist [ ] =
                { "/usr/lib/libU77_p.a", 
                  "/usr/lib/libF77_p.a", 
 static char *p_liblist [ ] =
                { "/usr/lib/libU77_p.a", 
                  "/usr/lib/libF77_p.a", 


@@ -49,3 +50,8 @@ static char *p_liblist [ ] =
                  "/usr/lib/libF77_p.a", 
                  "/usr/lib/libm_p.a", 
                  "/usr/lib/libc_p.a",NULL };
                  "/usr/lib/libF77_p.a", 
                  "/usr/lib/libm_p.a", 
                  "/usr/lib/libc_p.a",NULL };

+
+#include <paths.h>
+
+#define        _PATH_BSHELL    "/bin/sh"
+#define        _PATH_CPP       "/usr/bin/cpp"

diff --git a/usr/src/usr.bin/f77/f77.vax/Makefile b/usr/src/usr.bin/f77/f77.vax/Makefile
index befde2d..8c6de6e 100644 (file)
--- a/usr/src/usr.bin/f77/f77.vax/Makefile
+++ b/usr/src/usr.bin/f77/f77.vax/Makefile
@@ -9,7 +9,7 @@
 # software without specific prior written permission. This software
 # is provided ``as is'' without express or implied warranty.
 #
 # software without specific prior written permission. This software
 # is provided ``as is'' without express or implied warranty.
 #

-#      @(#)Makefile    5.1 (Berkeley) %G%
+#      @(#)Makefile    5.2 (Berkeley) %G%

 #
 CFLAGS=        -DHERE=VAX -DTARGET=VAX -DFAMILY=PCC -DUCBVAXASM -DUCBPASS2 \
        -O -I../include
 #
 CFLAGS=        -DHERE=VAX -DTARGET=VAX -DFAMILY=PCC -DUCBVAXASM -DUCBPASS2 \
        -O -I../include


@@ -29,7 +29,7 @@ depend: FRC
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: FRC
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: FRC

-       install -s -o bin -g bin -m 755 f77 ${DESTDIR}/usr/bin/f77
+       install -s -o bin -g bin -m 755 f77 ${DESTDIR}/usr/bin

 
 lint: FRC
        lint ${CFLAGS} ${SRCS}
 
 lint: FRC
        lint ${CFLAGS} ${SRCS}

diff --git a/usr/src/usr.bin/f77/f77.vax/f77.c b/usr/src/usr.bin/f77/f77.vax/f77.c
index 0ca4582..2cf0a18 100644 (file)
--- a/usr/src/usr.bin/f77/f77.vax/f77.c
+++ b/usr/src/usr.bin/f77/f77.vax/f77.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)f77.c      5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)f77.c      5.5 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -81,11 +81,11 @@ static      char sccsid[] = "@(#)f77.c      5.4 (Berkeley) %G%";
  */
 
 char *xxxvers = "\n@(#) F77 DRIVER, VERSION 4.2,   1984 JULY 28\n";
  */
 
 char *xxxvers = "\n@(#) F77 DRIVER, VERSION 4.2,   1984 JULY 28\n";

-#include <stdio.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>

+#include <sys/signal.h>

 #include <ctype.h>
 #include <ctype.h>

-#include <signal.h>
+#include <stdio.h>

 
 #ifdef SIGPROF
 /*
 
 #ifdef SIGPROF
 /*


@@ -100,7 +100,7 @@ char *xxxvers = "\n@(#) F77 DRIVER, VERSION 4.2,   1984 JULY 28\n";
 
 #include "defines.h"
 #include "machdefs.h"
 
 #include "defines.h"
 #include "machdefs.h"

-#include "drivedefs.h"
+#include "pathnames.h"

 #include "version.h"
 
 static FILEP diagfile  = {stderr} ;
 #include "version.h"
 
 static FILEP diagfile  = {stderr} ;


@@ -118,8 +118,8 @@ static char *ldname = LDNAME ;
 static char *footname  = FOOTNAME;
 static char *proffoot  = PROFFOOT;
 static char *macroname = "m4";
 static char *footname  = FOOTNAME;
 static char *proffoot  = PROFFOOT;
 static char *macroname = "m4";

-static char *shellname = "/bin/sh";
-static char *cppname   = "/lib/cpp";
+static char *shellname = _PATH_BSHELL;
+static char *cppname   = _PATH_CPP;

 static char *aoutname  = "a.out" ;
 static char *temppref  = TEMPPREF;
 
 static char *aoutname  = "a.out" ;
 static char *temppref  = TEMPPREF;
 


@@ -902,7 +902,7 @@ sys(str)
 char *str;
 {
 register char *s, *t;
 char *str;
 {
 register char *s, *t;

-char *argv[100], path[100];
+char *argv[100];

 char *inname, *outname;
 int append;
 int waitpid;
 char *inname, *outname;
 int append;
 int waitpid;


@@ -951,12 +951,6 @@ if(argc == 1)   /* no command */
        return(-1);
 argv[argc] = 0;
 
        return(-1);
 argv[argc] = 0;
 

-s = path;
-t = "/usr/bin/";
-while(*t)
-       *s++ = *t++;
-for(t = argv[1] ; *s++ = *t++ ; )
-       ;

 if((waitpid = fork()) == 0)
        {
        if(inname)
 if((waitpid = fork()) == 0)
        {
        if(inname)


@@ -967,11 +961,9 @@ if((waitpid = fork()) == 0)
                        fatalstr("Cannot open %s", outname);
        enbint(SIG_DFL);
 
                        fatalstr("Cannot open %s", outname);
        enbint(SIG_DFL);
 

-       texec(path+9, argv);  /* command */
-       texec(path+4, argv);  /*  /bin/command */
-       texec(path  , argv);  /* /usr/bin/command */
+       texec(argv[1], argv);

 
 

-       fatalstr("Cannot load %s",path+9);
+       fatalstr("Cannot load %s", argv[1]);

        }
 
 return( await(waitpid) );
        }
 
 return( await(waitpid) );


@@ -1230,7 +1222,7 @@ if(fn!=NULL && *fn!='\0')
 LOCAL fname(name, suff)
 char *name, *suff;
 {
 LOCAL fname(name, suff)
 char *name, *suff;
 {

-sprintf(name, "/tmp/%s%d.%s", temppref, pid, suff);
+sprintf(name, "%s/%s%d.%s", _PATH_TMP, temppref, pid, suff);

 }
 
 
 }
 
 

diff --git a/usr/src/usr.bin/f77/f77.vax/pathnames.h b/usr/src/usr.bin/f77/f77.vax/pathnames.h
index 5dff155..417f892 100644 (file)
--- a/usr/src/usr.bin/f77/f77.vax/pathnames.h
+++ b/usr/src/usr.bin/f77/f77.vax/pathnames.h
@@ -22,14 +22,14 @@
        Wrong Definitions File!
 #endif
 
        Wrong Definitions File!
 #endif
 

-#define PASS1NAME      "/usr/lib/f77pass1"
-#define PASS2NAME      "/lib/f1"
-#define PASS2OPT       "/lib/c2"
-#define ASMNAME                "/bin/as"
-#define LDNAME         "/bin/ld"
+#define PASS1NAME      "/usr/libexec/f77pass1"
+#define PASS2NAME      "/usr/libexec/f1"
+#define PASS2OPT       "/usr/libexec/c2"
+#define ASMNAME                "/usr/bin/as"
+#define LDNAME         "/usr/bin/ld"

 #define        CATNAME         "/bin/cat"
 #define        CATNAME         "/bin/cat"

-#define FOOTNAME       "/lib/crt0.o"
-#define PROFFOOT       "/lib/mcrt0.o"
+#define FOOTNAME       "/usr/lib/crt0.o"
+#define PROFFOOT       "/usr/lib/mcrt0.o"

 #define        GPRFFOOT        "/usr/lib/gcrt0.o"
 #define TEMPPREF       "fort"
 
 #define        GPRFFOOT        "/usr/lib/gcrt0.o"
 #define TEMPPREF       "fort"
 


@@ -37,3 +37,9 @@ static char *liblist [ ] =
                { "-lU77", "-lF77", "-lI77", "-lm", "-lc", NULL };
 static char *p_liblist [ ] =
                { "-lU77_p", "-lF77_p", "-lI77_p", "-lm_p", "-lc_p", NULL };
                { "-lU77", "-lF77", "-lI77", "-lm", "-lc", NULL };
 static char *p_liblist [ ] =
                { "-lU77_p", "-lF77_p", "-lI77_p", "-lm_p", "-lc_p", NULL };

+
+#include <paths.h>
+
+#define        _PATH_BSHELL    "/bin/sh"
+#define        _PATH_CPP       "/usr/bin/cpp"
+#define        _PATH_UBIN      "/usr/bin"

diff --git a/usr/src/usr.bin/f77/pass1.tahoe/Makefile b/usr/src/usr.bin/f77/pass1.tahoe/Makefile
index 14ac869..25ca0ed 100644 (file)
--- a/usr/src/usr.bin/f77/pass1.tahoe/Makefile
+++ b/usr/src/usr.bin/f77/pass1.tahoe/Makefile
@@ -3,7 +3,7 @@
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)Makefile    5.1     (Berkeley)      %G%
+#      @(#)Makefile    5.2     (Berkeley)      %G%

 #
 CFLAGS=        -O -DHERE=TAHOE -DTARGET=TAHOE -DFAMILY=PCC -DUCBVAXASM \
        -DUCBPASS2 -I$(INCLDIR)/usr/include -I../include
 #
 CFLAGS=        -O -DHERE=TAHOE -DTARGET=TAHOE -DFAMILY=PCC -DUCBVAXASM \
        -DUCBPASS2 -I$(INCLDIR)/usr/include -I../include


@@ -31,85 +31,20 @@ gram.head: defs.h data.h
 tokdefs.h: tokens
        grep -n . <tokens | sed "s/\([^:]*\):\(.*\)/#define \2 \1/" >tokdefs.h
 
 tokdefs.h: tokens
        grep -n . <tokens | sed "s/\([^:]*\):\(.*\)/#define \2 \1/" >tokdefs.h
 

-clean: FRC
+clean:

        rm -f ${OBJS} core f77pass1 gram.c gram.in
 
        rm -f ${OBJS} core f77pass1 gram.c gram.in
 

-depend: ${SRCS} FRC
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}

        mkdep ${CFLAGS} ${SRCS}
 
        mkdep ${CFLAGS} ${SRCS}
 

-install: FRC
-       install -s -o bin -g bin -m 755 f77pass1 ${DESTDIR}/usr/lib/f77pass1
+install: ${MAN}
+       install -s -o bin -g bin -m 755 f77pass1 ${DESTDIR}/usr/libexec

 
 

-lint: ${SRCS} FRC
+lint: ${SRCS}

        lint ${CFLAGS} ${SRCS}
 
        lint ${CFLAGS} ${SRCS}
 

-tags: ${SRCS} FRC
+tags: ${SRCS}

        ctags ${SRCS}
        ctags ${SRCS}

-
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-bb.o: bb.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-bb.o: ../include/defines.h ../include/machdefs.h optim.h
-conv.o: conv.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-conv.o: ../include/defines.h ../include/machdefs.h conv.h
-data.o: data.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-data.o: ../include/defines.h ../include/machdefs.h data.h
-equiv.o: equiv.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-equiv.o: ../include/defines.h ../include/machdefs.h /usr/include/a.out.h
-equiv.o: /usr/include/sys/exec.h /usr/include/stab.h
-error.o: error.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-error.o: ../include/defines.h ../include/machdefs.h
-exec.o: exec.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-exec.o: ../include/defines.h ../include/machdefs.h optim.h
-expr.o: expr.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-expr.o: ../include/defines.h ../include/machdefs.h
-fmt.o: fmt.c format.h
-gram.o: gram.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-gram.o: ../include/defines.h ../include/machdefs.h data.h /usr/include/a.out.h
-gram.o: /usr/include/sys/exec.h /usr/include/stab.h
-init.o: init.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-init.o: ../include/defines.h ../include/machdefs.h io.h /usr/include/sys/file.h
-intr.o: intr.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-intr.o: ../include/defines.h ../include/machdefs.h
-io.o: io.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-io.o: ../include/defines.h ../include/machdefs.h io.h
-lex.o: lex.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-lex.o: ../include/defines.h ../include/machdefs.h tokdefs.h
-main.o: main.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-main.o: ../include/defines.h ../include/machdefs.h /usr/include/signal.h
-main.o: /usr/include/machine/trap.h /usr/include/a.out.h
-main.o: /usr/include/sys/exec.h /usr/include/stab.h
-misc.o: misc.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-misc.o: ../include/defines.h ../include/machdefs.h
-optcse.o: optcse.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-optcse.o: ../include/defines.h ../include/machdefs.h optim.h
-optim.o: optim.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-optim.o: ../include/defines.h ../include/machdefs.h optim.h
-optloop.o: optloop.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-optloop.o: ../include/defines.h ../include/machdefs.h optim.h
-paramset.o: paramset.c defs.h /usr/include/stdio.h /usr/include/ctype.h
-paramset.o: ftypes.h ../include/defines.h ../include/machdefs.h data.h
-proc.o: proc.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-proc.o: ../include/defines.h ../include/machdefs.h /usr/include/a.out.h
-proc.o: /usr/include/sys/exec.h /usr/include/stab.h
-put.o: put.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-put.o: ../include/defines.h ../include/machdefs.h /usr/include/pcc.h
-putpcc.o: putpcc.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-putpcc.o: ../include/defines.h ../include/machdefs.h /usr/include/pcc.h
-regalloc.o: regalloc.c defs.h /usr/include/stdio.h /usr/include/ctype.h
-regalloc.o: ftypes.h ../include/defines.h ../include/machdefs.h optim.h
-setfmt.o: setfmt.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-setfmt.o: ../include/defines.h ../include/machdefs.h format.h
-stab.o: stab.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-stab.o: ../include/defines.h ../include/machdefs.h /usr/include/sys/types.h
-stab.o: /usr/include/a.out.h /usr/include/sys/exec.h /usr/include/stab.h
-tahoe.o: tahoe.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-tahoe.o: ../include/defines.h ../include/machdefs.h /usr/include/a.out.h
-tahoe.o: /usr/include/sys/exec.h /usr/include/stab.h /usr/include/pcc.h
-tahoex.o: tahoex.c /usr/include/stdio.h ../include/defines.h
-tahoex.o: ../include/machdefs.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/usr/src/usr.bin/f77/pass1.tahoe/init.c b/usr/src/usr.bin/f77/pass1.tahoe/init.c
index cb6feb7..736f7bd 100644 (file)
--- a/usr/src/usr.bin/f77/pass1.tahoe/init.c
+++ b/usr/src/usr.bin/f77/pass1.tahoe/init.c
@@ -29,6 +29,7 @@ static        char *sccsid = "@(#)init.c      5.1 (Berkeley) 85/06/07";
 #include "defs.h"
 #include "io.h"
 #include <sys/file.h>
 #include "defs.h"
 #include "io.h"
 #include <sys/file.h>

+#include "pathnames.h"

 
 
 FILEP infile   = { stdin };
 
 
 FILEP infile   = { stdin };


@@ -186,10 +187,10 @@ fileinit()
 int pid;
 
 pid = getpid();
 int pid;
 
 pid = getpid();

-sprintf(cdatafname, "/tmp/fortcd.%d", pid);
-sprintf(cchkfname, "/tmp/fortcc.%d", pid);
-sprintf(vdatafname, "/tmp/fortvd.%d", pid);
-sprintf(vchkfname, "/tmp/fortvc.%d", pid);
+sprintf(cdatafname, "%s/fortcd.%d", _PATH_TMP, pid);
+sprintf(cchkfname, "%s/fortcc.%d", _PATH_TMP, pid);
+sprintf(vdatafname, "%s/fortvd.%d", _PATH_TMP, pid);
+sprintf(vchkfname, "%s/fortvc.%d", _PATH_TMP, pid);

 
 cdatafile = open(cdatafname, O_CREAT | O_RDWR, 0600);
 if (cdatafile < 0)
 
 cdatafile = open(cdatafname, O_CREAT | O_RDWR, 0600);
 if (cdatafile < 0)

diff --git a/usr/src/usr.bin/f77/pass1.tahoe/lex.c b/usr/src/usr.bin/f77/pass1.tahoe/lex.c
index 79274ba..b074836 100644 (file)
--- a/usr/src/usr.bin/f77/pass1.tahoe/lex.c
+++ b/usr/src/usr.bin/f77/pass1.tahoe/lex.c
@@ -25,6 +25,7 @@ static char sccsid[] = "@(#)lex.c     5.1 (Berkeley) 6/7/85";
 
 #include "defs.h"
 #include "tokdefs.h"
 
 #include "defs.h"
 #include "tokdefs.h"

+#include "pathnames.h"

 
 # define BLANK ' '
 # define MYQUOTE (2)
 
 # define BLANK ' '
 # define MYQUOTE (2)


@@ -161,7 +162,7 @@ else        {
 
        if( (fp = fopen(temp, "r")) == NULL )
                {
 
        if( (fp = fopen(temp, "r")) == NULL )
                {

-               sprintf(temp, "/usr/include/%s", name);
+               sprintf(temp, "%s/%s", _PATH_INCLUDES, name);

                fp = fopen(temp, "r");
                }
        if(fp)
                fp = fopen(temp, "r");
                }
        if(fp)

diff --git a/usr/src/usr.bin/f77/pass1.vax/Makefile b/usr/src/usr.bin/f77/pass1.vax/Makefile
index 7adf763..9b56081 100644 (file)
--- a/usr/src/usr.bin/f77/pass1.vax/Makefile
+++ b/usr/src/usr.bin/f77/pass1.vax/Makefile
@@ -3,7 +3,7 @@
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)Makefile    5.4     (Berkeley)      %G%
+#      @(#)Makefile    5.5     (Berkeley)      %G%

 #
 CFLAGS=        -O -DHERE=VAX -DTARGET=VAX -DFAMILY=PCC -DUCBVAXASM \
        -DUCBPASS2 -DNAMELIST -I../include
 #
 CFLAGS=        -O -DHERE=VAX -DTARGET=VAX -DFAMILY=PCC -DUCBVAXASM \
        -DUCBPASS2 -DNAMELIST -I../include


@@ -31,84 +31,20 @@ gram.head: defs.h data.h
 tokdefs.h: tokens
        grep -n . <tokens | sed "s/\([^:]*\):\(.*\)/#define \2 \1/" >tokdefs.h
 
 tokdefs.h: tokens
        grep -n . <tokens | sed "s/\([^:]*\):\(.*\)/#define \2 \1/" >tokdefs.h
 

-clean: FRC
+clean:

        rm -f ${OBJS} core f77pass1 gram.c gram.in
 
        rm -f ${OBJS} core f77pass1 gram.c gram.in
 

-depend: ${SRCS} FRC
+cleandir: clean
+       rm -f ${MAN} tags .depend
+
+depend: ${SRCS}

        mkdep ${CFLAGS} ${SRCS}
 
        mkdep ${CFLAGS} ${SRCS}
 

-install: FRC
-       install -s -o bin -g bin -m 755 f77pass1 ${DESTDIR}/usr/lib/f77pass1
+install: ${MAN}
+       install -s -o bin -g bin -m 755 f77pass1 ${DESTDIR}/usr/libexec

 
 

-lint: ${SRCS} FRC
+lint: ${SRCS}

        lint ${CFLAGS} ${SRCS}
 
        lint ${CFLAGS} ${SRCS}
 

-tags: ${SRCS} FRC
+tags: ${SRCS}

        ctags ${SRCS}
        ctags ${SRCS}

-
-FRC:
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-bb.o: bb.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-bb.o: ../include/defines.h ../include/machdefs.h optim.h
-conv.o: conv.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-conv.o: ../include/defines.h ../include/machdefs.h conv.h
-data.o: data.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-data.o: ../include/defines.h ../include/machdefs.h data.h
-equiv.o: equiv.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-equiv.o: ../include/defines.h ../include/machdefs.h /usr/include/a.out.h
-equiv.o: /usr/include/sys/exec.h /usr/include/stab.h
-error.o: error.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-error.o: ../include/defines.h ../include/machdefs.h
-exec.o: exec.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-exec.o: ../include/defines.h ../include/machdefs.h optim.h
-expr.o: expr.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-expr.o: ../include/defines.h ../include/machdefs.h /usr/include/signal.h
-expr.o: /usr/include/setjmp.h
-fmt.o: fmt.c format.h
-gram.o: gram.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-gram.o: ../include/defines.h ../include/machdefs.h data.h /usr/include/a.out.h
-gram.o: /usr/include/sys/exec.h /usr/include/stab.h
-init.o: init.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-init.o: ../include/defines.h ../include/machdefs.h io.h /usr/include/sys/file.h
-intr.o: intr.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-intr.o: ../include/defines.h ../include/machdefs.h
-io.o: io.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-io.o: ../include/defines.h ../include/machdefs.h io.h
-lex.o: lex.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-lex.o: ../include/defines.h ../include/machdefs.h tokdefs.h
-main.o: main.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-main.o: ../include/defines.h ../include/machdefs.h /usr/include/signal.h
-main.o: /usr/include/a.out.h /usr/include/sys/exec.h /usr/include/stab.h
-misc.o: misc.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-misc.o: ../include/defines.h ../include/machdefs.h
-optcse.o: optcse.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-optcse.o: ../include/defines.h ../include/machdefs.h optim.h
-optim.o: optim.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-optim.o: ../include/defines.h ../include/machdefs.h optim.h
-optloop.o: optloop.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-optloop.o: ../include/defines.h ../include/machdefs.h optim.h
-paramset.o: paramset.c defs.h /usr/include/stdio.h /usr/include/ctype.h
-paramset.o: ftypes.h ../include/defines.h ../include/machdefs.h data.h
-proc.o: proc.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-proc.o: ../include/defines.h ../include/machdefs.h /usr/include/a.out.h
-proc.o: /usr/include/sys/exec.h /usr/include/stab.h
-put.o: put.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-put.o: ../include/defines.h ../include/machdefs.h /usr/include/pcc.h
-putpcc.o: putpcc.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-putpcc.o: ../include/defines.h ../include/machdefs.h /usr/include/pcc.h
-regalloc.o: regalloc.c defs.h /usr/include/stdio.h /usr/include/ctype.h
-regalloc.o: ftypes.h ../include/defines.h ../include/machdefs.h optim.h
-setfmt.o: setfmt.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-setfmt.o: ../include/defines.h ../include/machdefs.h format.h
-stab.o: stab.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-stab.o: ../include/defines.h ../include/machdefs.h /usr/include/sys/types.h
-stab.o: /usr/include/a.out.h /usr/include/sys/exec.h /usr/include/stab.h
-vax.o: vax.c defs.h /usr/include/stdio.h /usr/include/ctype.h ftypes.h
-vax.o: ../include/defines.h ../include/machdefs.h /usr/include/a.out.h
-vax.o: /usr/include/sys/exec.h /usr/include/stab.h /usr/include/pcc.h
-vaxx.o: vaxx.c /usr/include/stdio.h ../include/defines.h ../include/machdefs.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/usr/src/usr.bin/f77/pass1.vax/init.c b/usr/src/usr.bin/f77/pass1.vax/init.c
index b96c1c8..add517f 100644 (file)
--- a/usr/src/usr.bin/f77/pass1.vax/init.c
+++ b/usr/src/usr.bin/f77/pass1.vax/init.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char *sccsid = "@(#)init.c      5.3 (Berkeley) %G%";
+static char *sccsid = "@(#)init.c      5.4 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -35,6 +35,7 @@ static        char *sccsid = "@(#)init.c      5.3 (Berkeley) %G%";
 #include "defs.h"
 #include "io.h"
 #include <sys/file.h>
 #include "defs.h"
 #include "io.h"
 #include <sys/file.h>

+#include "pathnames.h"

 
 
 FILEP infile   = { stdin };
 
 
 FILEP infile   = { stdin };


@@ -195,10 +196,10 @@ fileinit()
 int pid;
 
 pid = getpid();
 int pid;
 
 pid = getpid();

-sprintf(cdatafname, "/tmp/fortcd.%d", pid);
-sprintf(cchkfname, "/tmp/fortcc.%d", pid);
-sprintf(vdatafname, "/tmp/fortvd.%d", pid);
-sprintf(vchkfname, "/tmp/fortvc.%d", pid);
+sprintf(cdatafname, "%s/fortcd.%d", _PATH_TMP, pid);
+sprintf(cchkfname, "%s/fortcc.%d", _PATH_TMP, pid);
+sprintf(vdatafname, "%s/fortvd.%d", _PATH_TMP, pid);
+sprintf(vchkfname, "%s/fortvc.%d", _PATH_TMP, pid);

 
 cdatafile = open(cdatafname, O_CREAT | O_RDWR, 0600);
 if (cdatafile < 0)
 
 cdatafile = open(cdatafname, O_CREAT | O_RDWR, 0600);
 if (cdatafile < 0)

diff --git a/usr/src/usr.bin/f77/pass1.vax/lex.c b/usr/src/usr.bin/f77/pass1.vax/lex.c
index f5947f5..8e2e025 100644 (file)
--- a/usr/src/usr.bin/f77/pass1.vax/lex.c
+++ b/usr/src/usr.bin/f77/pass1.vax/lex.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)lex.c      5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)lex.c      5.4 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -38,6 +38,7 @@ static char sccsid[] = "@(#)lex.c     5.3 (Berkeley) %G%";
 
 #include "defs.h"
 #include "tokdefs.h"
 
 #include "defs.h"
 #include "tokdefs.h"

+#include "pathnames.h"

 
 # define BLANK ' '
 # define MYQUOTE (2)
 
 # define BLANK ' '
 # define MYQUOTE (2)


@@ -174,7 +175,7 @@ else        {
 
        if( (fp = fopen(temp, "r")) == NULL )
                {
 
        if( (fp = fopen(temp, "r")) == NULL )
                {

-               sprintf(temp, "/usr/include/%s", name);
+               sprintf(temp, "%s/%s", _PATH_INCLUDES, name);

                fp = fopen(temp, "r");
                }
        if(fp)
                fp = fopen(temp, "r");
                }
        if(fp)

diff --git a/usr/src/usr.bin/fpr/Makefile b/usr/src/usr.bin/fpr/Makefile
index dbccfa0..1e57dd6 100644 (file)
--- a/usr/src/usr.bin/fpr/Makefile
+++ b/usr/src/usr.bin/fpr/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    5.2 (Berkeley) %G%
+#      @(#)Makefile    5.3 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a


@@ -37,7 +37,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 fpr ${DESTDIR}/usr/ucb/fpr
+       install -s -o bin -g bin -m 755 fpr ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/fsplit/Makefile b/usr/src/usr.bin/fsplit/Makefile
index 7757f32..a5623b0 100644 (file)
--- a/usr/src/usr.bin/fsplit/Makefile
+++ b/usr/src/usr.bin/fsplit/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    5.2 (Berkeley) %G%
+#      @(#)Makefile    5.3 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a


@@ -37,7 +37,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 fsplit ${DESTDIR}/usr/ucb/fsplit
+       install -s -o bin -g bin -m 755 fsplit ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/gcore/Makefile b/usr/src/usr.bin/gcore/Makefile
index 4edc01c..0443aed 100644 (file)
--- a/usr/src/usr.bin/gcore/Makefile
+++ b/usr/src/usr.bin/gcore/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g kmem -m 2755 gcore ${DESTDIR}/usr/ucb
+       install -s -o bin -g kmem -m 2755 gcore ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/gprof/Makefile b/usr/src/usr.bin/gprof/Makefile
index d6c0b55..a31a2c1 100644 (file)
--- a/usr/src/usr.bin/gprof/Makefile
+++ b/usr/src/usr.bin/gprof/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    5.15 (Berkeley) %G%
+#      @(#)Makefile    5.16 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a


@@ -49,9 +49,9 @@ depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 gprof ${DESTDIR}/usr/ucb/gprof
-       install -c -o bin -g bin -m 444 gprof.flat ${DESTDIR}/usr/lib
-       install -c -o bin -g bin -m 444 gprof.callg ${DESTDIR}/usr/lib
+       install -s -o bin -g bin -m 755 gprof ${DESTDIR}/usr/bin
+       install -c -o bin -g bin -m 444 gprof.flat gprof.callg \
+           ${DESTDIR}/usr/share/misc

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/gprof/gprof.h b/usr/src/usr.bin/gprof/gprof.h
index 8725454..d9789c2 100644 (file)
--- a/usr/src/usr.bin/gprof/gprof.h
+++ b/usr/src/usr.bin/gprof/gprof.h
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)gprof.h     5.6 (Berkeley) %G%
+ *     @(#)gprof.h     5.7 (Berkeley) %G%

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>


@@ -59,12 +59,6 @@ char *gmonname;
 #define        GMONNAME                "gmon.out"
 #define        GMONSUM                 "gmon.sum"
 
 #define        GMONNAME                "gmon.out"
 #define        GMONSUM                 "gmon.sum"
 

-    /*
-     * blurbs on the flat and graph profiles.
-     */
-#define        FLAT_BLURB      "/usr/lib/gprof.flat"
-#define        CALLG_BLURB     "/usr/lib/gprof.callg"
-

     /*
      * a constructed arc,
      *     with pointers to the namelist entry of the parent and the child,
     /*
      * a constructed arc,
      *     with pointers to the namelist entry of the parent and the child,

diff --git a/usr/src/usr.bin/gprof/printgprof.c b/usr/src/usr.bin/gprof/printgprof.c
index f68432b..59ab55c 100644 (file)
--- a/usr/src/usr.bin/gprof/printgprof.c
+++ b/usr/src/usr.bin/gprof/printgprof.c
@@ -16,10 +16,11 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)printgprof.c       5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)printgprof.c       5.6 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "gprof.h"
 #endif /* not lint */
 
 #include "gprof.h"

+#include "pathnames.h"

 
 printprof()
 {
 
 printprof()
 {


@@ -75,7 +76,7 @@ flatprofheader()
 {
     
     if ( bflag ) {
 {
     
     if ( bflag ) {

-       printblurb( FLAT_BLURB );
+       printblurb( _PATH_FLAT_BLURB );

     }
     printf( "\ngranularity: each sample hit covers %d byte(s)" ,
            (long) scale * sizeof(UNIT) );
     }
     printf( "\ngranularity: each sample hit covers %d byte(s)" ,
            (long) scale * sizeof(UNIT) );


@@ -121,7 +122,7 @@ gprofheader()
 {
 
     if ( bflag ) {
 {
 
     if ( bflag ) {

-       printblurb( CALLG_BLURB );
+       printblurb( _PATH_CALLG_BLURB );

     }
     printf( "\ngranularity: each sample hit covers %d byte(s)" ,
            (long) scale * sizeof(UNIT) );
     }
     printf( "\ngranularity: each sample hit covers %d byte(s)" ,
            (long) scale * sizeof(UNIT) );

diff --git a/usr/src/usr.bin/m4/Makefile b/usr/src/usr.bin/m4/Makefile
index cc17e93..48e2906 100644 (file)
--- a/usr/src/usr.bin/m4/Makefile
+++ b/usr/src/usr.bin/m4/Makefile
@@ -15,7 +15,7 @@ Virgin BTL M4 as sent out in 4.1
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    5.4 (Berkeley) %G%
+#      @(#)Makefile    5.5 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 m4 ${DESTDIR}/usr/bin/m4
+       install -s -o bin -g bin -m 755 m4 ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/m4/m4.c b/usr/src/usr.bin/m4/m4.c
index c8815b2..866981e 100644 (file)
--- a/usr/src/usr.bin/m4/m4.c
+++ b/usr/src/usr.bin/m4/m4.c
@@ -1,10 +1,11 @@
 Virgin BTL M4 as sent out in 4.1
 #ifndef lint
 Virgin BTL M4 as sent out in 4.1
 #ifndef lint

-static char sccsid[] = "@(#)m4.c       1.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)m4.c       1.5 (Berkeley) %G%";

 #endif
 
 #include <stdio.h>
 #include <signal.h>
 #endif
 
 #include <stdio.h>
 #include <signal.h>

+#include "pathnames.h"

 
 #define ERROR NULL
 #define        READ    "r"
 
 #define ERROR NULL
 #define        READ    "r"


@@ -105,7 +106,7 @@ char        *syscmdloc;
 char   *dumploc;
 char   *errploc;
 
 char   *dumploc;
 char   *errploc;
 

-char   tempname[] = "/tmp/m4aXXXXX";
+char   tempname[] = _PATH_TMP;

 struct nlist   *lookup();
 char   *install();
 char   *malloc();
 struct nlist   *lookup();
 char   *install();
 char   *malloc();

diff --git a/usr/src/usr.bin/mkstr/Makefile b/usr/src/usr.bin/mkstr/Makefile
index 67baf98..62e9869 100644 (file)
--- a/usr/src/usr.bin/mkstr/Makefile
+++ b/usr/src/usr.bin/mkstr/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 mkstr ${DESTDIR}/usr/ucb
+       install -s -o bin -g bin -m 755 mkstr ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/nm/Makefile b/usr/src/usr.bin/nm/Makefile
index 07639b6..b45a1d1 100644 (file)
--- a/usr/src/usr.bin/nm/Makefile
+++ b/usr/src/usr.bin/nm/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 nm ${DESTDIR}/bin
+       install -s -o bin -g bin -m 755 nm ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/size/Makefile b/usr/src/usr.bin/size/Makefile
index aa75d80..cf410e6 100644 (file)
--- a/usr/src/usr.bin/size/Makefile
+++ b/usr/src/usr.bin/size/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 size ${DESTDIR}/bin
+       install -s -o bin -g bin -m 755 size ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/strings/Makefile b/usr/src/usr.bin/strings/Makefile
index 4480e30..da7df8e 100644 (file)
--- a/usr/src/usr.bin/strings/Makefile
+++ b/usr/src/usr.bin/strings/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 strings ${DESTDIR}/usr/ucb
+       install -s -o bin -g bin -m 755 strings ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/strip/Makefile b/usr/src/usr.bin/strip/Makefile
index 1dfd5dd..8bef4bc 100644 (file)
--- a/usr/src/usr.bin/strip/Makefile
+++ b/usr/src/usr.bin/strip/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 strip ${DESTDIR}/bin
+       install -s -o bin -g bin -m 755 strip ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/struct/struct/Makefile b/usr/src/usr.bin/struct/struct/Makefile
index 559d642..2da72c6 100644 (file)
--- a/usr/src/usr.bin/struct/struct/Makefile
+++ b/usr/src/usr.bin/struct/struct/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    4.6 {Berkeley} %G%
+#      @(#)Makefile    4.7 {Berkeley} %G%

 #
 CFLAGS=        -O
 YFLAGS=        -d
 #
 CFLAGS=        -O
 YFLAGS=        -d


@@ -53,10 +53,9 @@ depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       -[ -d ${DESTDIR}/usr/lib/struct ] || mkdir ${DESTDIR}/usr/lib/struct
-       install -s -o bin -g bin -m 755 structure ${DESTDIR}/usr/lib/struct
-       install -s -o bin -g bin -m 755 beautify ${DESTDIR}/usr/lib/struct
-       install -c -o bin -g bin -m 755 struct ${DESTDIR}/usr/bin/struct
+       install -s -o bin -g bin -m 755 structure beautify \
+           ${DESTDIR}/usr/libexec
+       install -c -o bin -g bin -m 755 struct ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/struct/struct/struct.sh b/usr/src/usr.bin/struct/struct/struct.sh
index 05e47e2..8917c37 100644 (file)
--- a/usr/src/usr.bin/struct/struct/struct.sh
+++ b/usr/src/usr.bin/struct/struct/struct.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
 #! /bin/sh
 #

-#      @(#)struct.sh   4.2     (Berkeley)      83/12/19
+#      @(#)struct.sh   4.3     (Berkeley)      89/05/10

 #
 trap "rm -f /tmp/struct*$$" 0 1 2 3 13 15
 files=no
 #
 trap "rm -f /tmp/struct*$$" 0 1 2 3 13 15
 files=no


@@ -14,10 +14,10 @@ done
 
 case $files in
 yes)
 
 case $files in
 yes)

-       /usr/lib/struct/structure $* >/tmp/struct$$
+       /usr/libexec/structure $* >/tmp/struct$$

        ;;
 no)
        cat >/tmp/structin$$
        ;;
 no)
        cat >/tmp/structin$$

-       /usr/lib/struct/structure /tmp/structin$$ $* >/tmp/struct$$
+       /usr/libexec/structure /tmp/structin$$ $* >/tmp/struct$$

 esac &&
 esac &&

-       /usr/lib/struct/beautify</tmp/struct$$
+       /usr/libexec/beautify</tmp/struct$$

diff --git a/usr/src/usr.bin/xstr/Makefile b/usr/src/usr.bin/xstr/Makefile
index 8ab9903..59872c0 100644 (file)
--- a/usr/src/usr.bin/xstr/Makefile
+++ b/usr/src/usr.bin/xstr/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 xstr ${DESTDIR}/usr/ucb
+       install -s -o bin -g bin -m 755 xstr ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/xstr/xstr.c b/usr/src/usr.bin/xstr/xstr.c
index 3e0fea3..242f23c 100644 (file)
--- a/usr/src/usr.bin/xstr/xstr.c
+++ b/usr/src/usr.bin/xstr/xstr.c
@@ -22,13 +22,14 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)xstr.c     5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)xstr.c     5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-#include <stdio.h>
-#include <ctype.h>

 #include <sys/types.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <signal.h>

+#include <stdio.h>
+#include <ctype.h>
+#include "pathnames.h"

 
 /*
  * xstr - extract and hash strings in a C program
 
 /*
  * xstr - extract and hash strings in a C program


@@ -89,7 +90,7 @@ main(argc, argv)
        if (cflg || argc == 0 && !readstd)
                inithash();
        else
        if (cflg || argc == 0 && !readstd)
                inithash();
        else

-               strings = mktemp(savestr("/tmp/xstrXXXXXX"));
+               strings = mktemp(savestr(_PATH_TMP));

        while (readstd || argc > 0) {
                if (freopen("x.c", "w", stdout) == NULL)
                        perror("x.c"), exit(1);
        while (readstd || argc > 0) {
                if (freopen("x.c", "w", stdout) == NULL)
                        perror("x.c"), exit(1);