diff options
| author | Xin LI <delphij@FreeBSD.org> | 2019-05-08 08:43:15 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2019-05-08 08:43:15 +0000 |
| commit | c9083b850aed19fff781fd82084e8308c9ae6df6 (patch) | |
| tree | 1c62bbcb66814653c183613885cab0741a0611a0 /lib/libz | |
| parent | 6889af8687386c296a24edfb48dd6cbcc90166c1 (diff) | |
Notes
Diffstat (limited to 'lib/libz')
| -rw-r--r-- | lib/libz/FREEBSD-upgrade | 2 | ||||
| -rw-r--r-- | lib/libz/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libz/FREEBSD-upgrade b/lib/libz/FREEBSD-upgrade index e5bb54d1fbfca..203ae5c220c23 100644 --- a/lib/libz/FREEBSD-upgrade +++ b/lib/libz/FREEBSD-upgrade @@ -8,7 +8,7 @@ benefit other consumers. To Update: 1) Unpack vendor sources into a clean directory. 2) Import onto the vendor area. - 3) Merge the vendor tree to contrib/zlib, which contains a stripped down + 3) Merge the vendor tree to sys/contrib/zlib, which contains a stripped down version of upstream source, resolve any conflicts. 4) Double check zconf.h, zlib.pc, and Symbol.map to make sure that we have the required changes. Test universe and commit them. diff --git a/lib/libz/Makefile b/lib/libz/Makefile index 96c46c67265b7..9d415a8b976c7 100644 --- a/lib/libz/Makefile +++ b/lib/libz/Makefile @@ -9,7 +9,7 @@ SHLIB_MAJOR= 6 MAN= zlib.3 zopen.3 MLINKS+= zopen.3 zdopen.3 -ZLIBSRC= ${SRCTOP}/contrib/zlib +ZLIBSRC= ${SRCTOP}/sys/contrib/zlib .PATH: ${ZLIBSRC} |