diff --git a/curses-lib/build b/curses-lib/build
index 98f7abe..aeec30f 100755
--- a/curses-lib/build
+++ b/curses-lib/build
@@ -9,10 +9,47 @@ pushd build
 make -C include
 make -C progs tic
 popd
-./configure --prefix=/usr --build=$(./config.guess) --mandir=/usr/share/man --with-manpage-format=normal --with-shared --without-debug --without-ada --without-normal --enable-widec
+./configure --prefix=/usr --build=$(./config.guess) --mandir=/usr/share/man --with-manpage-format=normal --with-shared --without-debug --without-ada --without-normal --enable-widec --with-pkg-config-libdir=/usr/lib/ncurses//lib/pkgconfig
 make
-make install DESTDIR="$1"
-
-cp libncursesw.so /lib/libncursesw.so
-ln -s /lib/libncursesw.so /lib/libncurses.so
+make DESTDIR="$1" install 
+ln -s $1/usr/lib/ncurses/bin/captoinfo $1/usr/bin/
+ln -s $1/usr/lib/ncurses/bin/clear $1/usr/bin/
+ln -s $1/usr/lib/ncurses/bin/infocmp $1/usr/bin/
+ln -s $1/usr/lib/ncurses/bin/infotocap $1/usr/bin/
+ln -s $1/usr/lib/ncurses/bin/ncurses6-config $1/usr/bin/
+ln -s $1/usr/lib/ncurses/bin/reset $1/usr/bin/
+ln -s $1/usr/lib/ncurses/bin/tabs $1/usr/bin/
+ln -s $1/usr/lib/ncurses/bin/tic $1/usr/bin/
+ln -s $1/usr/lib/ncurses/bin/toe $1/usr/bin/
+ln -s $1/usr/lib/ncurses/bin/tput $1/usr/bin/
+ln -s $1/usr/lib/ncurses/bin/tset $1/usr/bin/
+ln -s $1/usr/lib/ncurses/include/ncurses $1/usr/include
+ln -s $1/usr/lib/ncurses/lib/libform.a $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libform_g.a $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libform.so $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libform.so.6 $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libform.so.6.1 $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libmenu.a $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libmenu_g.a $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libmenu.so $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libmenu.so.6 $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libmenu.so.6.1 $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libncurses++.a $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libncurses.a $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libncurses++_g.a $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libncurses_g.a $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libncurses.so $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libncurses.so.6 $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libncurses.so.6.1 $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libpanel.a $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libpanel_g.a $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libpanel.so $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libpanel.so.6 $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/libpanel.so.6.1 $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/terminfo $1/usr/lib/
+ln -s $1/usr/lib/ncurses/lib/pkgconfig/form.pc $1/usr/lib/pkgconfig/
+ln -s $1/usr/lib/ncurses/lib/pkgconfig/menu.pc $1/usr/lib/pkgconfig/
+ln -s $1/usr/lib/ncurses/lib/pkgconfig/ncurses++.pc $1/usr/lib/pkgconfig/
+ln -s $1/usr/lib/ncurses/lib/pkgconfig/ncurses.pc $1/usr/lib/pkgconfig/
+ln -s $1/usr/lib/ncurses/lib/pkgconfig/panel.pc $1/usr/lib/pkgconfig/
 echo "INPUT(-lncursesw)" > $1/usr/lib/libncurses.so
diff --git a/flex/build b/flex/build
index 645b69c..d499d01 100755
--- a/flex/build
+++ b/flex/build
@@ -8,5 +8,5 @@ HELP2MAN=/tools/bin/true ./configure --prefix=/usr --docdir=/usr/share/doc/flex-
 make
 make check
 make install DESTDIR="$1"
+ln -sv flex $1/usr/bin/lex
 
-ln -sv flex /usr/bin/lex