| 1 |
diff -ur lib.orig/libc/Makefile lib/libc/Makefile
|
| 2 |
--- lib.orig/libc/Makefile Thu Apr 7 12:11:33 2005
|
| 3 |
+++ lib/libc/Makefile Thu Apr 7 12:26:50 2005
|
| 4 |
@@ -13,7 +13,7 @@
|
| 5 |
SHLIB_MAJOR= 5
|
| 6 |
SHLIBDIR?= /lib
|
| 7 |
WARNS?= 2
|
| 8 |
-CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
|
| 9 |
+CFLAGS+=-I${.CURDIR}/include -I/usr/include
|
| 10 |
CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH}
|
| 11 |
CLEANFILES+=tags
|
| 12 |
INSTALL_PIC_ARCHIVE=
|
| 13 |
Only in lib/libc: Makefile.orig
|
| 14 |
diff -ur lib.orig/libc/sys/Makefile.inc lib/libc/sys/Makefile.inc
|
| 15 |
--- lib.orig/libc/sys/Makefile.inc Thu Apr 7 12:11:33 2005
|
| 16 |
+++ lib/libc/sys/Makefile.inc Thu Apr 7 12:26:58 2005
|
| 17 |
@@ -6,7 +6,7 @@
|
| 18 |
|
| 19 |
# Include the generated makefile containing the *complete* list
|
| 20 |
# of syscall names in MIASM.
|
| 21 |
-.include "${.CURDIR}/../../sys/sys/syscall.mk"
|
| 22 |
+.include "/usr/src/sys/sys/syscall.mk"
|
| 23 |
|
| 24 |
# Include machine dependent definitions.
|
| 25 |
#
|
| 26 |
Only in lib/libc/sys: Makefile.inc.orig
|
| 27 |
diff -ur lib.orig/libcam/Makefile lib/libcam/Makefile
|
| 28 |
--- lib.orig/libcam/Makefile Thu Apr 7 12:11:33 2005
|
| 29 |
+++ lib/libcam/Makefile Thu Apr 7 12:27:06 2005
|
| 30 |
@@ -34,9 +34,9 @@
|
| 31 |
cam_cdbparse.3 csio_encode_visit.3 \
|
| 32 |
cam_cdbparse.3 buff_encode_visit.3
|
| 33 |
|
| 34 |
-.PATH: ${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam
|
| 35 |
+.PATH: /usr/src/sys/cam/scsi /usr/src/sys/cam
|
| 36 |
|
| 37 |
-SDIR= ${.CURDIR}/../../sys
|
| 38 |
+SDIR= /usr/src/sys
|
| 39 |
CFLAGS+= -I${.CURDIR} -I${SDIR}
|
| 40 |
|
| 41 |
.include <bsd.lib.mk>
|
| 42 |
Only in lib/libcam: Makefile.orig
|
| 43 |
diff -ur lib.orig/libkvm/Makefile lib/libkvm/Makefile
|
| 44 |
--- lib.orig/libkvm/Makefile Thu Apr 7 12:11:34 2005
|
| 45 |
+++ lib/libkvm/Makefile Thu Apr 7 12:17:40 2005
|
| 46 |
@@ -3,7 +3,7 @@
|
| 47 |
|
| 48 |
LIB= kvm
|
| 49 |
SHLIBDIR?= /lib
|
| 50 |
-CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
|
| 51 |
+CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -I/usr/src/sys
|
| 52 |
SRCS= kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \
|
| 53 |
kvm_getswapinfo.c kvm_proc.c
|
| 54 |
INCS= kvm.h
|
| 55 |
Only in lib/libkvm: Makefile.orig
|
| 56 |
diff -ur lib.orig/libncurses/Makefile lib/libncurses/Makefile
|
| 57 |
--- lib.orig/libncurses/Makefile Thu Apr 7 12:11:34 2005
|
| 58 |
+++ lib/libncurses/Makefile Thu Apr 7 12:28:02 2005
|
| 59 |
@@ -255,6 +255,7 @@
|
| 60 |
|
| 61 |
.if !defined(NOHTML)
|
| 62 |
afterinstall:
|
| 63 |
+ ${INSTALL} -d ${DESTDIR}${DOCSDIR}
|
| 64 |
.for file in ${DOCS}
|
| 65 |
cd ${.CURDIR}/../../contrib/ncurses/doc/html ; \
|
| 66 |
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \
|
| 67 |
Only in lib/libncurses: Makefile.orig
|
| 68 |
diff -ur lib.orig/libngatm/Makefile lib/libngatm/Makefile
|
| 69 |
--- lib.orig/libngatm/Makefile Thu Apr 7 12:11:34 2005
|
| 70 |
+++ lib/libngatm/Makefile Thu Apr 7 12:27:55 2005
|
| 71 |
@@ -8,7 +8,7 @@
|
| 72 |
WARNS?= 6
|
| 73 |
|
| 74 |
# source of the library lives in contrib
|
| 75 |
-SDIR= ${.CURDIR}/../../sys
|
| 76 |
+SDIR= /usr/src/sys
|
| 77 |
CTRB= ${.CURDIR}/../../contrib/ngatm
|
| 78 |
LIBBASE= ${SDIR}/contrib/ngatm
|
| 79 |
|
| 80 |
Only in lib/libngatm: Makefile.orig
|
| 81 |
diff -ur lib.orig/libsbuf/Makefile lib/libsbuf/Makefile
|
| 82 |
--- lib.orig/libsbuf/Makefile Thu Apr 7 12:11:34 2005
|
| 83 |
+++ lib/libsbuf/Makefile Thu Apr 7 12:21:30 2005
|
| 84 |
@@ -5,6 +5,6 @@
|
| 85 |
SRCS= subr_sbuf.c
|
| 86 |
WARNS?= 2
|
| 87 |
|
| 88 |
-.PATH: ${.CURDIR}/../../sys/kern
|
| 89 |
+.PATH: /usr/src/sys/kern
|
| 90 |
|
| 91 |
.include <bsd.lib.mk>
|
| 92 |
Only in lib/libsbuf: Makefile.orig
|
| 93 |
diff -ur lib.orig/libthr/Makefile lib/libthr/Makefile
|
| 94 |
--- lib.orig/libthr/Makefile Thu Apr 7 12:11:35 2005
|
| 95 |
+++ lib/libthr/Makefile Thu Apr 7 12:28:14 2005
|
| 96 |
@@ -14,6 +14,7 @@
|
| 97 |
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
|
| 98 |
-I${.CURDIR}/../../include
|
| 99 |
CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
|
| 100 |
+CFLAGS+=-I/usr/src/sys
|
| 101 |
|
| 102 |
# enable extra internal consistancy checks
|
| 103 |
CFLAGS+=-D_PTHREADS_INVARIANTS
|
| 104 |
Only in lib/libthr: Makefile.orig
|
| 105 |
diff -ur lib.orig/libypclnt/Makefile lib/libypclnt/Makefile
|
| 106 |
--- lib.orig/libypclnt/Makefile Thu Apr 7 12:11:34 2005
|
| 107 |
+++ lib/libypclnt/Makefile Thu Apr 7 12:22:15 2005
|
| 108 |
@@ -24,8 +24,8 @@
|
| 109 |
yppasswd_private_xdr.c
|
| 110 |
|
| 111 |
RPCGEN= rpcgen -C
|
| 112 |
-RPCSRC= ${.CURDIR}/../../include/rpcsvc/yp.x
|
| 113 |
-RPCSRC_PW= ${.CURDIR}/../../include/rpcsvc/yppasswd.x
|
| 114 |
+RPCSRC= /usr/include/rpcsvc/yp.x
|
| 115 |
+RPCSRC_PW= /usr/include/rpcsvc/yppasswd.x
|
| 116 |
RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x
|
| 117 |
|
| 118 |
yp.h: ${RPCSRC}
|
| 119 |
Only in lib/libypclnt: Makefile.orig
|
Parent Directory
| 
Revision Log