home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Fresh Fish 4
/
FreshFish_May-June1994.bin
/
bsd
/
src
/
make
/
make.diffs
next >
Wrap
Text File
|
1994-02-25
|
9KB
|
329 lines
diff -rc make/make.1 make-amiga/make.1
*** make/make.1 Fri Sep 24 03:23:11 1993
--- make-amiga/make.1 Fri Feb 25 16:39:08 1994
***************
*** 826,832 ****
and
.Ev MAKEOBJDIR .
.Sh FILES
! .Bl -tag -width /usr/share/mk -compact
.It .depend
list of dependencies
.It Makefile
--- 826,832 ----
and
.Ev MAKEOBJDIR .
.Sh FILES
! .Bl -tag -width /bsd/share/mk -compact
.It .depend
list of dependencies
.It Makefile
***************
*** 835,841 ****
list of dependencies
.It sys.mk
system makefile
! .It /usr/share/mk
system makefile directory
.El
.Sh SEE ALSO
--- 835,841 ----
list of dependencies
.It sys.mk
system makefile
! .It /bsd/share/mk
system makefile directory
.El
.Sh SEE ALSO
diff -rc make/pathnames.h make-amiga/pathnames.h
*** make/pathnames.h Fri Sep 24 03:23:24 1993
--- make-amiga/pathnames.h Fri Feb 25 16:39:09 1994
***************
*** 35,39 ****
#define _PATH_OBJDIR "obj"
#define _PATH_DEFSHELLDIR "/bin"
! #define _PATH_DEFSYSMK "/usr/share/mk/sys.mk"
! #define _PATH_DEFSYSPATH "/usr/share/mk"
--- 35,39 ----
#define _PATH_OBJDIR "obj"
#define _PATH_DEFSHELLDIR "/bin"
! #define _PATH_DEFSYSMK "/bsd/share/mk/sys.mk"
! #define _PATH_DEFSYSPATH "/bsd/share/mk"
diff -rc make/share/bsd.README make-amiga/share/bsd.README
*** make/share/bsd.README Thu Sep 23 21:41:01 1993
--- make-amiga/share/bsd.README Fri Feb 25 16:39:11 1994
***************
*** 1,7 ****
# @(#)bsd.README 5.1 (Berkeley) 5/11/90
This is the README file for the new make "include" files for the BSD
! source tree. The files are installed in /usr/share/mk, and are, by
convention, named with the suffix ".mk". Each ".mk" file has a
corresponding ".rd" file which is an explanation of the ".mk" file.
--- 1,7 ----
# @(#)bsd.README 5.1 (Berkeley) 5/11/90
This is the README file for the new make "include" files for the BSD
! source tree. The files are installed in /bsd/share/mk, and are, by
convention, named with the suffix ".mk". Each ".mk" file has a
corresponding ".rd" file which is an explanation of the ".mk" file.
***************
*** 169,176 ****
COPTS Additional flags to the compiler when creating C objects.
HIDEGAME If HIDEGAME is defined, the binary is installed in
! /usr/games/hide, and a symbolic link is created to
! /usr/games/dm.
LDADD Additional loader objects. Usually used for libraries.
For example, to load with the compatibility and utility
--- 169,176 ----
COPTS Additional flags to the compiler when creating C objects.
HIDEGAME If HIDEGAME is defined, the binary is installed in
! /bsd/games/hide, and a symbolic link is created to
! /bsd/games/dm.
LDADD Additional loader objects. Usually used for libraries.
For example, to load with the compatibility and utility
diff -rc make/share/bsd.doc.mk make-amiga/share/bsd.doc.mk
*** make/share/bsd.doc.mk Thu Sep 23 21:41:02 1993
--- make-amiga/share/bsd.doc.mk Fri Feb 25 16:39:12 1994
***************
*** 31,37 ****
spell: ${SRCS}
spell ${SRCS} | sort | comm -23 - spell.ok > paper.spell
! BINDIR?= /usr/share/doc
BINGRP?= bin
BINOWN?= bin
BINMODE?= 444
--- 31,37 ----
spell: ${SRCS}
spell ${SRCS} | sort | comm -23 - spell.ok > paper.spell
! BINDIR?= /bsd/share/doc
BINGRP?= bin
BINOWN?= bin
BINMODE?= 444
diff -rc make/share/bsd.lib.mk make-amiga/share/bsd.lib.mk
*** make/share/bsd.lib.mk Thu Sep 23 21:41:02 1993
--- make-amiga/share/bsd.lib.mk Fri Feb 25 16:39:13 1994
***************
*** 4,11 ****
.include "${.CURDIR}/../Makefile.inc"
.endif
! LIBDIR?= /usr/lib
! LINTLIBDIR?= /usr/libdata/lint
LIBGRP?= bin
LIBOWN?= bin
LIBMODE?= 444
--- 4,11 ----
.include "${.CURDIR}/../Makefile.inc"
.endif
! LIBDIR?= /bsd/lib
! LINTLIBDIR?= /bsd/libdata/lint
LIBGRP?= bin
LIBOWN?= bin
LIBMODE?= 444
***************
*** 23,29 ****
.SUFFIXES: .out .o .po .s .c .f .y .l .8 .7 .6 .5 .4 .3 .2 .1 .0
.8.0 .7.0 .6.0 .5.0 .4.0 .3.0 .2.0 .1.0:
! nroff -mandoc ${.IMPSRC} > ${.TARGET}
.c.o:
${CC} ${CFLAGS} -c ${.IMPSRC}
--- 23,29 ----
.SUFFIXES: .out .o .po .s .c .f .y .l .8 .7 .6 .5 .4 .3 .2 .1 .0
.8.0 .7.0 .6.0 .5.0 .4.0 .3.0 .2.0 .1.0:
! sh nroff -mandoc ${.IMPSRC} > ${.TARGET}
.c.o:
${CC} ${CFLAGS} -c ${.IMPSRC}
***************
*** 147,155 ****
.else
obj:
@cd ${.CURDIR}; rm -rf obj; \
! here=`pwd`; dest=/usr/obj/`echo $$here | sed 's,/usr/src/,,'`; \
echo "$$here -> $$dest"; ln -s $$dest obj; \
! if test -d /usr/obj -a ! -d $$dest; then \
mkdir -p $$dest; \
else \
true; \
--- 147,155 ----
.else
obj:
@cd ${.CURDIR}; rm -rf obj; \
! here=`pwd`; dest=/bsd/obj/`echo $$here | sed 's,/bsd/src/,,'`; \
echo "$$here -> $$dest"; ln -s $$dest obj; \
! if test -d /bsd/obj -a ! -d $$dest; then \
mkdir -p $$dest; \
else \
true; \
diff -rc make/share/bsd.man.mk make-amiga/share/bsd.man.mk
*** make/share/bsd.man.mk Thu Sep 23 21:41:02 1993
--- make-amiga/share/bsd.man.mk Fri Feb 25 16:39:14 1994
***************
*** 8,14 ****
MANOWN?= bin
MANMODE?= 444
! MANDIR?= /usr/share/man/cat
MINSTALL= install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
--- 8,14 ----
MANOWN?= bin
MANMODE?= 444
! MANDIR?= /bsd/share/man/cat
MINSTALL= install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
diff -rc make/share/bsd.prog.mk make-amiga/share/bsd.prog.mk
*** make/share/bsd.prog.mk Thu Sep 23 21:41:02 1993
--- make-amiga/share/bsd.prog.mk Fri Feb 25 16:39:15 1994
***************
*** 7,13 ****
.SUFFIXES: .out .o .c .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0
.8.0 .7.0 .6.0 .5.0 .4.0 .3.0 .2.0 .1.0:
! nroff -mandoc ${.IMPSRC} > ${.TARGET}
CFLAGS+=${COPTS}
--- 7,13 ----
.SUFFIXES: .out .o .c .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0
.8.0 .7.0 .6.0 .5.0 .4.0 .3.0 .2.0 .1.0:
! sh nroff -mandoc ${.IMPSRC} > ${.TARGET}
CFLAGS+=${COPTS}
***************
*** 17,38 ****
BINOWN?= bin
BINMODE?= 555
! LIBC?= /usr/lib/libc.a
! LIBCOMPAT?= /usr/lib/libcompat.a
! LIBCURSES?= /usr/lib/libcurses.a
! LIBDBM?= /usr/lib/libdbm.a
! LIBDES?= /usr/lib/libdes.a
! LIBL?= /usr/lib/libl.a
! LIBKDB?= /usr/lib/libkdb.a
! LIBKRB?= /usr/lib/libkrb.a
! LIBM?= /usr/lib/libm.a
! LIBMP?= /usr/lib/libmp.a
! LIBPC?= /usr/lib/libpc.a
! LIBPLOT?= /usr/lib/libplot.a
! LIBRESOLV?= /usr/lib/libresolv.a
! LIBRPC?= /usr/lib/sunrpc.a
! LIBTERM?= /usr/lib/libterm.a
! LIBUTIL?= /usr/lib/libutil.a
.if defined(SHAREDSTRINGS)
CLEANFILES+=strings
--- 17,38 ----
BINOWN?= bin
BINMODE?= 555
! LIBC?= /bsd/lib/libc.a
! LIBCOMPAT?= /bsd/lib/libcompat.a
! LIBCURSES?= /bsd/lib/libcurses.a
! LIBDBM?= /bsd/lib/libdbm.a
! LIBDES?= /bsd/lib/libdes.a
! LIBL?= /bsd/lib/libl.a
! LIBKDB?= /bsd/lib/libkdb.a
! LIBKRB?= /bsd/lib/libkrb.a
! LIBM?= /bsd/lib/libm.a
! LIBMP?= /bsd/lib/libmp.a
! LIBPC?= /bsd/lib/libpc.a
! LIBPLOT?= /bsd/lib/libplot.a
! LIBRESOLV?= /bsd/lib/libresolv.a
! LIBRPC?= /bsd/lib/sunrpc.a
! LIBTERM?= /bsd/lib/libterm.a
! LIBUTIL?= /bsd/lib/libutil.a
.if defined(SHAREDSTRINGS)
CLEANFILES+=strings
***************
*** 119,125 ****
${PROG} ${DESTDIR}${BINDIR}
.endif
.if defined(HIDEGAME)
! (cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}; \
chown games.bin ${PROG})
.endif
.if defined(LINKS) && !empty(LINKS)
--- 119,125 ----
${PROG} ${DESTDIR}${BINDIR}
.endif
.if defined(HIDEGAME)
! (cd ${DESTDIR}/bsd/games; rm -f ${PROG}; ln -s dm ${PROG}; \
chown games.bin ${PROG})
.endif
.if defined(LINKS) && !empty(LINKS)
***************
*** 154,162 ****
.else
obj: _PROGSUBDIR
@cd ${.CURDIR}; rm -rf obj; \
! here=`pwd`; dest=/usr/obj/`echo $$here | sed 's,/usr/src/,,'`; \
echo "$$here -> $$dest"; ln -s $$dest obj; \
! if test -d /usr/obj -a ! -d $$dest; then \
mkdir -p $$dest; \
else \
true; \
--- 154,162 ----
.else
obj: _PROGSUBDIR
@cd ${.CURDIR}; rm -rf obj; \
! here=`pwd`; dest=/bsd/obj/`echo $$here | sed 's,/bsd/src/,,'`; \
echo "$$here -> $$dest"; ln -s $$dest obj; \
! if test -d /bsd/obj -a ! -d $$dest; then \
mkdir -p $$dest; \
else \
true; \
diff -rc make/share/sys.mk make-amiga/share/sys.mk
*** make/s