From 535c0b208c22825c2be10c2da5542442fe2aa25e Mon Sep 17 00:00:00 2001 From: segler Date: Thu, 12 May 2011 18:10:41 +0000 Subject: [PATCH] changes for 1.0.22 git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@6100 504e572c-2e33-0410-9681-be2bf7408885 --- SysBuild/tools/sane-backends | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/SysBuild/tools/sane-backends b/SysBuild/tools/sane-backends index 126ecca..2930a16 100644 --- a/SysBuild/tools/sane-backends +++ b/SysBuild/tools/sane-backends @@ -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 }