summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc16
-rw-r--r--lib/Makefile10
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 70c9b0c..8bb8680 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -453,7 +453,7 @@ build32:
cd ${.CURDIR}/${_dir}; \
${LIB32MAKE} DESTDIR=${LIB32TMP} obj
.endfor
-.for _dir in lib/libncurses lib/libmagic
+.for _dir in lib/ncurses/ncurses lib/libmagic
cd ${.CURDIR}/${_dir}; \
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= build-tools
.endfor
@@ -932,7 +932,7 @@ build-tools:
bin/csh \
bin/sh \
${_rescue} \
- lib/libncurses \
+ lib/ncurses/ncurses \
${_share} \
${_aicasm} \
usr.bin/awk \
@@ -1020,7 +1020,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
- lib/libncurses lib/libopie lib/libpam \
+ lib/ncurses/ncurses lib/libopie lib/libpam \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
diff --git a/lib/Makefile b/lib/Makefile
index 665cd98..a0b32ba 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -12,7 +12,7 @@
# libkvm must be built before libdevstat.
# msun must be built before libg++ and libstdc++.
# libmd must be built before libatm, libopie, libradius, and libtacplus.
-# libncurses must be built before libdialog, libedit and libreadline.
+# ncurses must be built before libdialog, libedit and libreadline.
# libnetgraph must be built before libbsnmp/modules/snmp_netgraph.
# libopie must be built before libpam.
# libradius must be built before libpam.
@@ -24,15 +24,15 @@
#
# Otherwise, the SUBDIR list should be in alphabetical order.
-SUBDIR= ${_csu} libbsm libcom_err libcrypt libelf libkvm msun libmd libncurses \
+SUBDIR= ${_csu} libbsm libcom_err libcrypt libelf libkvm msun libmd ncurses \
libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
${_libypclnt} libalias libarchive ${_libatm} \
libbegemot ${_libbluetooth} libbsnmp libbz2 libc \
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
- libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \
+ libedit libexpat libfetch libftpio libgeom ${_libgpib} \
libgssapi libipsec \
- ${_libipx} libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \
- ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \
+ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \
+ ${_libncp} ${_libngatm} libopie libpam libpcap \
libpmc ${_libpthread} librt ${_libsdp} ${_libsm} ${_libsmb} \
${_libsmdb} \
${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \
OpenPOWER on IntegriCloud