Link Fehler korrigiert - -k flag für make ist jetzt nicht mehr noetig.
git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6160 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
2cf18cdc7d
commit
872c3f29dd
@ -79,18 +79,12 @@ premk() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
|
||||||
ADDOPTIONS="--libdir=\${prefix}/lib64"
|
|
||||||
fi
|
|
||||||
CC="gcc $BUILDOPTIONS" \
|
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
|
||||||
USE_ARCH=$UARCH \
|
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
./configure --prefix=/usr/X11R7 \
|
./configure --prefix=/usr/X11R7 \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
$ADDOPTIONS \
|
--libdir=\${prefix}/${LIBDIR} \
|
||||||
--with-nspr-includes=/opt/firefox/include/firefox/stable \
|
--with-nspr-includes=/opt/firefox/include/firefox/stable \
|
||||||
--with-nspr-libs=/opt/firefox/$LIBDIR/firefox \
|
--with-nspr-libs=/opt/firefox/$LIBDIR/firefox \
|
||||||
--with-nss-includes=/opt/firefox/include/firefox/stable \
|
--with-nss-includes=/opt/firefox/include/firefox/stable \
|
||||||
@ -104,10 +98,12 @@ mk() {
|
|||||||
--disable-nm
|
--disable-nm
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
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%\(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 %" {} \;
|
find . -name "Makefile" -exec sed -i "s%/usr/X11R7/lib %/usr/X11R7/lib64 %" {} \;
|
||||||
fi
|
fi
|
||||||
make -k -j $NUMCPU
|
sed -i "s/\(libgnt\.la\)/\1 -lncursesw /" finch/Makefile
|
||||||
make -k -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU
|
||||||
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
CheckError "Make install process failed !" 1
|
CheckError "Make install process failed !" 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user