Einige Fixes, die in -lXp verhindern (bei xmkmf). Ausserdem installation

für lib und lib64..



git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6075 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2011-04-12 13:47:26 +00:00
parent 24e6b48988
commit 1c1eb78208

View File

@ -76,17 +76,31 @@ premk() {
echo "Nothing to do for premk()" echo "Nothing to do for premk()"
} }
mk() { mk32() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/X11R7/lib64"
fi
./configure --host=$TARGET \ ./configure --host=$TARGET \
--localstatedir=/var \ --localstatedir=/var \
--infodir=/usr/share/info \ --infodir=/usr/share/info \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
$ADDOPTIONS \ --libdir=/usr/X11R7/lib \
--prefix=/usr/X11R7 --prefix=/usr/X11R7
make -j $NUMCPU DESTDIR=$TMPROOT install make -j $NUMCPU DESTDIR=$TMPROOT install
make distclean
sed -i "s/\(XPLIBSRC = \)/#\1/" $TMPROOT/usr/X11R7/lib/X11/config/X11.tmpl
sed -i "s/\$(XPLIBSRC)//g" $TMPROOT/usr/X11R7/lib/X11/config/X11.tmpl
sed -i "s/\$(XPLIB)//g" $TMPROOT/usr/X11R7/lib/X11/config/X11.tmpl
}
mk() {
./configure --host=$TARGET \
--localstatedir=/var \
--infodir=/usr/share/info \
--mandir=/usr/share/man \
--libdir=/usr/X11R7/${LIBDIR} \
--prefix=/usr/X11R7
make -j $NUMCPU DESTDIR=$TMPROOT install
sed -i "s/\(XPLIBSRC = \)/#\1/" $TMPROOT/usr/X11R7/${LIBDIR}/X11/config/X11.tmpl
sed -i "s/\$(XPLIBSRC)//g" $TMPROOT/usr/X11R7/lib/${LIBDIR}/config/X11.tmpl
sed -i "s/\$(XPLIB)//g" $TMPROOT/usr/X11R7/lib/${LIBDIR}/config/X11.tmpl
} }
postmk() { postmk() {