file system reorganization; pathnames.h

SCCS-vsn: usr.bin/ftp/Makefile 5.9
SCCS-vsn: libexec/ftpd/Makefile 5.10

diff --git a/usr/src/libexec/ftpd/Makefile b/usr/src/libexec/ftpd/Makefile
index 4b2445b..975b7e6 100644 (file)
--- a/usr/src/libexec/ftpd/Makefile
+++ b/usr/src/libexec/ftpd/Makefile
@@ -14,9 +14,9 @@
 # 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.9 (Berkeley) %G%
+#      @(#)Makefile    5.10 (Berkeley) %G%

 #
 #

-CFLAGS=        -O -DSETPROCTITLE
+CFLAGS=        -O -I../../usr.ucb/ftp -DSETPROCTITLE

 LIBC=  /lib/libc.a
 SRCS=  ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c
 OBJS=  ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o
 LIBC=  /lib/libc.a
 SRCS=  ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c
 OBJS=  ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o


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

-       install -s -o bin -g bin -m 755 ftpd ${DESTDIR}/etc/ftpd
+       install -s -o bin -g bin -m 755 ftpd ${DESTDIR}/usr/libexec

        install -c -o bin -g bin -m 755 ftpd.0 ${DESTDIR}/usr/man/cat8
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 755 ftpd.0 ${DESTDIR}/usr/man/cat8
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/ftp/Makefile b/usr/src/usr.bin/ftp/Makefile
index 63a2b8e..c590810 100644 (file)
--- a/usr/src/usr.bin/ftp/Makefile
+++ b/usr/src/usr.bin/ftp/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.8 (Berkeley) %G%
+#      @(#)Makefile    5.9 (Berkeley) %G%

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


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

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

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