summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2012-12-24 00:31:35 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2012-12-24 00:31:35 +0400
commit86842e35c6df12e14a0b1868ff3238879a6120fc (patch)
tree0d88e9ca63f20ea6b7a0384f1d4b719a07964dba
parent709b9f55185e594a7f0772b05b1646a9a0fa5462 (diff)
downloadcibs-pkgs-86842e35c6df12e14a0b1868ff3238879a6120fc.tar.gz
Update ncursesw for newer cibs
-rw-r--r--ncurses/Makefile6
-rw-r--r--ncurses/ncursesw.p5m10
2 files changed, 7 insertions, 9 deletions
diff --git a/ncurses/Makefile b/ncurses/Makefile
index bedc404..01a62f2 100644
--- a/ncurses/Makefile
+++ b/ncurses/Makefile
@@ -40,8 +40,8 @@ configure-options += \
--with-ticlib=tic \
--with-termlib=tinfo
-configure-env.32 = \
- PKG_CONFIG_LIBDIR="$(libdir.32)/pkgconfig"
+configure-env += \
+ PKG_CONFIG_LIBDIR="/usr/lib$(lib-suffix.$(bits))/pkgconfig"
configure-options.32 = \
--without-manpages \
--without-progs
@@ -50,8 +50,6 @@ configure-options.32 = \
build-32-stamp: target = libs
install-32-stamp: target = install.libs
-configure-env.64 = \
- PKG_CONFIG_LIBDIR="$(libdir.64)/pkgconfig"
configure-options.64 = \
--with-progs
diff --git a/ncurses/ncursesw.p5m b/ncurses/ncursesw.p5m
index 8b968d9..668399b 100644
--- a/ncurses/ncursesw.p5m
+++ b/ncurses/ncursesw.p5m
@@ -28,11 +28,11 @@ file path=usr/include/ncursesw/term_entry.h
file path=usr/include/ncursesw/termcap.h
file path=usr/include/ncursesw/tic.h
file path=usr/include/ncursesw/unctrl.h
-file path=usr/lib/pkgconfig/formw.pc
-file path=usr/lib/pkgconfig/menuw.pc
-file path=usr/lib/pkgconfig/ncursesw.pc
-file path=usr/lib/pkgconfig/panelw.pc
-file path=usr/share/man/man1/ncurses5-config.1 facet.devel=true
+file path=usr/lib/$(mach64)/pkgconfig/formw.pc
+file path=usr/lib/$(mach64)/pkgconfig/menuw.pc
+file path=usr/lib/$(mach64)/pkgconfig/ncursesw.pc
+file path=usr/lib/$(mach64)/pkgconfig/panelw.pc
+file $(builddir.wide)/man/ncursesw5-config.1 path=usr/share/man/man1/ncursesw5-config.1 facet.devel=true
link path=usr/lib/$(mach64)/libcursesw.so target=libncursesw.so.5.9
link path=usr/lib/$(mach64)/libformw.so target=libformw.so.5
link path=usr/lib/$(mach64)/libmenuw.so target=libmenuw.so.5