diff --git a/SysBuild/network/pidgin b/SysBuild/network/pidgin index 40734e6..738a3f7 100644 --- a/SysBuild/network/pidgin +++ b/SysBuild/network/pidgin @@ -79,18 +79,12 @@ premk() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ - USE_ARCH=$UARCH \ CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ ./configure --prefix=/usr/X11R7 \ --sysconfdir=/etc \ - $ADDOPTIONS \ + --libdir=\${prefix}/${LIBDIR} \ --with-nspr-includes=/opt/firefox/include/firefox/stable \ --with-nspr-libs=/opt/firefox/$LIBDIR/firefox \ --with-nss-includes=/opt/firefox/include/firefox/stable \ @@ -104,10 +98,12 @@ mk() { --disable-nm if [ "$MK64BIT" == "true" ]; then find . -name "Makefile" -exec sed -i "s%\(DBUS_LIBS = \)-L/lib%\1-L/lib64%" {} \; + find . -name "Makefile" -exec sed -i "s%-L/lib %-L/lib64 %g" {} \; find . -name "Makefile" -exec sed -i "s%/usr/X11R7/lib %/usr/X11R7/lib64 %" {} \; fi - make -k -j $NUMCPU - make -k -j $NUMCPU DESTDIR=$TMPROOT install + sed -i "s/\(libgnt\.la\)/\1 -lncursesw /" finch/Makefile + make -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 }