file reorg, pathnames.h, paths.h

[unix-history] / usr / src / usr.bin / diff / diff3 / Makefile

diff --git a/usr/src/usr.bin/diff/diff3/Makefile b/usr/src/usr.bin/diff/diff3/Makefile
index 6cd0ff8..b3c823e 100644 (file)
--- a/usr/src/usr.bin/diff/diff3/Makefile
+++ b/usr/src/usr.bin/diff/diff3/Makefile
@@ -1,54 +1,21 @@
-autoconfig
-backingstore
-badsectforw
-bdp
-bottomhalf
-busadapter
-byte
-capability
-cbreak
-character
-cookedmode
-demandpage
-egid
-erasechar
-euid
-fodkluster
-gid
-hardlimit
-hardlock
-interruptvectab
-iopage
-ipl
-killchar
-kluster
-ldpctx
-mmapioarch
-msl
-nbio
-page
-pagedaemon
-panic
-psn
-rawmode
-recvwindow
-rgid
-ruid
-secondstorage
-sharedtextseg
-sigdrivenio
-slidingwindowscheme
-sndwindow
-stickytext
-svpctx
-swapper
-syspagetab
-text
-tophalf
-uid
-unbuffered
-usrrequest
-worderasechar
+#
+# Copyright (c) 1989 The Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation,
+# advertising materials, and other materials related to such
+# distribution and use acknowledge that the software was developed
+# by the University of California, Berkeley.  The name of the
+# University may not be used to endorse or promote products derived
+# from this software without specific prior written permission.
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+#
+#      @(#)Makefile    4.6 (Berkeley) %G%
+#

 CFLAGS=        -O
 LIBC=  /lib/libc.a
 SRCS=  diff3.c
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 SRCS=  diff3.c


@@ -70,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 diff3 $(DESTDIR)/usr/lib/diff3
+       install -s -o bin -g bin -m 755 diff3 $(DESTDIR)/usr/libexec/diff3

        install -c -o bin -g bin -m 755 diff3.sh $(DESTDIR)/usr/bin/diff3
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
        install -c -o bin -g bin -m 755 diff3.sh $(DESTDIR)/usr/bin/diff3
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1