add offsets, new fields

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

diff --git a/usr/src/usr.bin/ex/Makefile b/usr/src/usr.bin/ex/Makefile
index 451936b..0b0a9d4 100644 (file)
--- a/usr/src/usr.bin/ex/Makefile
+++ b/usr/src/usr.bin/ex/Makefile
@@ -3,21 +3,21 @@
 # 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    7.11 (Berkeley) %G%
+#      @(#)Makefile    7.13.1.1 (Berkeley) %G%

 #
 #
 # Copyright (c) 1980 Regents of the University of California.
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 #
 #
 # Copyright (c) 1980 Regents of the University of California.
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)Makefile    7.11 (Berkeley) %G%
+#      @(#)Makefile    7.13.1.1 (Berkeley) %G%

 #
 #
 # Copyright (c) 1980 Regents of the University of California.
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 #
 #
 # Copyright (c) 1980 Regents of the University of California.
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)Makefile    7.11 (Berkeley) %G%
+#      @(#)Makefile    7.13.1.1 (Berkeley) %G%

 #
 VERSION=3.7
 #
 #
 VERSION=3.7
 #


@@ -29,8 +29,7 @@ VERSION=3.7
 # software.  Things that can be turned off to save
 # space include LISPCODE (-l flag, showmatch and lisp options), UCVISUAL
 # (visual \ nonsense on upper case only terminals), CHDIR (the undocumented
 # software.  Things that can be turned off to save
 # space include LISPCODE (-l flag, showmatch and lisp options), UCVISUAL
 # (visual \ nonsense on upper case only terminals), CHDIR (the undocumented

-# chdir command.)  CRYPT includes the code to edit encrypted files (the -x
-# option, like ed.)  VMUNIX makes ex considerably larger, raising many limits
+# chdir command.)  VMUNIX makes ex considerably larger, raising many limits

 # and improving speed and simplicity of maintenance.  It is suitable only
 # for a VAX or other large machine, and then probably only in a paged system.
 #
 # and improving speed and simplicity of maintenance.  It is suitable only
 # for a VAX or other large machine, and then probably only in a paged system.
 #


@@ -49,7 +48,7 @@ XSTR= ${BINDIR}/xstr
 DEBUGFLAGS=    -DTRACE -g
 NONDEBUGFLAGS= -O
 DEB=   ${NONDEBUGFLAGS}        # or ${DEBUGFLAGS} to to debug
 DEBUGFLAGS=    -DTRACE -g
 NONDEBUGFLAGS= -O
 DEB=   ${NONDEBUGFLAGS}        # or ${DEBUGFLAGS} to to debug

-OPTIONS= -DCRYPT -DLISPCODE -DCHDIR -DUCVISUAL -DVFORK -DVMUNIX -DFASTTAG
+OPTIONS= -DLISPCODE -DCHDIR -DUCVISUAL -DVFORK -DVMUNIX -DFASTTAG

 CFLAGS=        -DTABS=8 ${OPTIONS} ${DEB}
 LDFLAGS=       -z              # or -i or -n
 TERMLIB=       -ltermcap
 CFLAGS=        -DTABS=8 ${OPTIONS} ${DEB}
 LDFLAGS=       -z              # or -i or -n
 TERMLIB=       -ltermcap


@@ -152,8 +151,8 @@ install: a.out exrecover expreserve
        ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/${BINDIR}/view
        ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/usr/bin/ex
        chmod 1755 ${DESTDIR}/${BINDIR}/ex
        ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/${BINDIR}/view
        ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/usr/bin/ex
        chmod 1755 ${DESTDIR}/${BINDIR}/ex

-       install -m 4755 exrecover ${DESTDIR}/${LIBDIR}/ex${VERSION}recover
-       install -m 4755 expreserve ${DESTDIR}/${LIBDIR}/ex${VERSION}preserve
+       install -s -o root -m 4755 exrecover ${DESTDIR}/${LIBDIR}/ex${VERSION}recover
+       install -s -o root -m 4755 expreserve ${DESTDIR}/${LIBDIR}/ex${VERSION}preserve

 # The following line normally fails.  This is OK.
        -mkdir ${DESTDIR}/usr/preserve
 
 # The following line normally fails.  This is OK.
        -mkdir ${DESTDIR}/usr/preserve