changes per kurt

[unix-history] / usr / src / usr.bin / mail / Makefile

diff --git a/usr/src/usr.bin/mail/Makefile b/usr/src/usr.bin/mail/Makefile
index 0bc9e7c..5276896 100644 (file)
--- a/usr/src/usr.bin/mail/Makefile
+++ b/usr/src/usr.bin/mail/Makefile
@@ -1,12 +1,12 @@
 #
 # Unix version 7.
 #
 #
 # Unix version 7.
 #

-# Sccs Id = "@(#)Makefile      2.7 %G%";
+# Sccs Id = "@(#)Makefile      2.11 %G%";

 #
 
 CFLAGS=-O -DVMUNIX -DV7
 XSTR=/usr/ucb/xstr
 #
 
 CFLAGS=-O -DVMUNIX -DV7
 XSTR=/usr/ucb/xstr

-DESTDIR=/usr/src
+DESTDIR=/

 CTAGS=/usr/ucb/ctags -w
 VPRINT=/usr/ucb/print
 CGRAF=/ja/rigel/rigel/bin/cgraf
 CTAGS=/usr/ucb/ctags -w
 VPRINT=/usr/ucb/print
 CGRAF=/ja/rigel/rigel/bin/cgraf


@@ -17,15 +17,16 @@ LIBES=-ljobs
 ED=-ed
 AS=-as
 RM=-rm
 ED=-ed
 AS=-as
 RM=-rm

-OBJS=aux.o cmd1.o cmd2.o cmd3.o cmdtab.o collect.o config.o edit.o fio.o \
+OBJS=version.o aux.o cmd1.o cmd2.o cmd3.o cmdtab.o collect.o \
+       config.o edit.o fio.o \

        getname.o head.o v7.local.o lock.o lex.o list.o main.o \
        names.o optim.o popen.o quit.o send.o strings.o temp.o tty.o \
        getname.o head.o v7.local.o lock.o lex.o list.o main.o \
        names.o optim.o popen.o quit.o send.o strings.o temp.o tty.o \

-       vars.o version.o errlst.o str.o
+       vars.o str.o

 
 SRCS=aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c config.c edit.c fio.c \
        getname.c head.c v7.local.c lock.c lex.c list.c main.c \
        names.c optim.c popen.c quit.c send.c strings.c temp.c tty.c vars.c \
 
 SRCS=aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c config.c edit.c fio.c \
        getname.c head.c v7.local.c lock.c lex.c list.c main.c \
        names.c optim.c popen.c quit.c send.c strings.c temp.c tty.c vars.c \

-       errlst.c version.c
+       version.c

 
 HDRS=rcv.h configdefs.h def.h glob.h v7.local.h local.h
 
 
 HDRS=rcv.h configdefs.h def.h glob.h v7.local.h local.h
 


@@ -51,9 +52,12 @@ mail.g:      $(SRCS)
 
 install:
        install -s Mail ${DESTDIR}/usr/ucb
 
 install:
        install -s Mail ${DESTDIR}/usr/ucb

-       cp Mail.help* ${DESTDIR}/usr/lib
+       cp misc/Mail.help* ${DESTDIR}/usr/lib

        cd ${DESTDIR}/usr/ucb; rm -f mail; ln Mail mail
 
        cd ${DESTDIR}/usr/ucb; rm -f mail; ln Mail mail
 

+version.o:     version.c
+       $(CC) -c -R version.c
+

 $S:
        sccs get $@;
 
 $S:
        sccs get $@;
 


@@ -81,22 +85,14 @@ str.o: strings
        mv xs.o str.o
        $(RM) xs.c
 
        mv xs.o str.o
        $(RM) xs.c
 

-config.o:      config.c
-       $(CC) -R -c config.c
-

 cmdtab.o: cmdtab.c
        $(CC) -R -c $(CFLAGS) cmdtab.c
 
 cmdtab.o: cmdtab.c
        $(CC) -R -c $(CFLAGS) cmdtab.c
 

-errlst.o: errlst.c
-       ${CC} -E ${CFLAGS} errlst.c | ${XSTR} -c -
-       ${CC} ${CFLAGS} -R -c x.c
-       mv x.o errlst.o
-

 print: $S fmt.c
        $(CGRAPH) > mail.g;
        $(NMKINDEX) > mail.i;
        $(DIRTCLOD) -x mail.i -p mail.g > mail.x
 print: $S fmt.c
        $(CGRAPH) > mail.g;
        $(NMKINDEX) > mail.i;
        $(DIRTCLOD) -x mail.i -p mail.g > mail.x

-       @$(VPRINT) makefile mail.x rcv.h def.h glob.h local.h v7.local.h \
+       @$(VPRINT) Makefile mail.x rcv.h def.h glob.h local.h v7.local.h \

            $(SRCS) fmt.c;
 
 wc:
            $(SRCS) fmt.c;
 
 wc: