changes for 1.0.22

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@6100 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
segler 2011-05-12 18:10:41 +00:00
parent 0ed9ad04e0
commit 535c0b208c

View File

@ -88,10 +88,12 @@ mk32() {
LDFLAGS="-L/usr/lib" \
./configure --host=$TARGET32 \
--prefix=/usr \
--sysconfdir=/etc/sysconfig &&
make -j $NUMCPU &&
make prefix=$TMPROOT/usr \
sysconfdir=$TMPROOT/etc/sysconfig install
--sysconfdir=/etc/sysconfig \
--with-gphoto2=no
mv doc/Makefile doc/Makefile.orig
sed -e "s/^doc_DATA.*=.*\$(HTML_PAGES)/doc_DATA = /g;s/STANDARD.*=.*sane.ps/STANDARD = /g" < doc/Makefile.orig > doc/Makefile
make -j $NUMCPU
make DESTDIR=${TMPROOT} install
CheckError "Make install process failed !" 1
make distclean
mv $TMPROOT/usr/bin/sane-config{,-32}
@ -107,10 +109,12 @@ mk() {
./configure --host=$TARGET \
--prefix=/usr \
$ADDOPTIONS \
--sysconfdir=/etc/sysconfig &&
make -j $NUMCPU &&
make prefix=$TMPROOT/usr \
sysconfdir=$TMPROOT/etc/sysconfig install
--sysconfdir=/etc/sysconfig \
--with-gphoto2=no
mv doc/Makefile doc/Makefile.orig
sed -e "s/^doc_DATA.*=.*\$(HTML_PAGES)/doc_DATA = /g;s/STANDARD.*=.*sane.ps/STANDARD = /g" < doc/Makefile.orig > doc/Makefile
make -j $NUMCPU
make DESTDIR=${TMPROOT} install
CheckError "Make install process failed !" 1
}