Added patch created by Vitaly Lipatov <LAV AT vl3143.spb.edu>:

Add --with-lockdir to configure for set path to lock dir Set PATH_SANE_LOCK_DIR really to lock dir (instead localstatedir) Updated german translation file.
2006-06-07 07:28:31 +00:00 · 2006-06-07 07:28:31 +00:00 · c25e16f38a
commit c25e16f38a
--- a/37
+++ b/37
@ -1,3 +1,13 @@
+2006-06-07  Gerhard Jaeger <gerhard@gjaeger.de>
+
+	* configure, configure.in, backend/Makefile.in
+	  include/sane/sanei_access.h sanei/Makefile.in
+	  sanei/sanei_access.c: Added patch created by
+	  Vitaly Lipatov <LAV AT vl3143.spb.edu>:
+	  Add --with-lockdir to configure for set path to lock dir
+	  Set PATH_SANE_LOCK_DIR really to lock dir (instead localstatedir)
+	* po/sane-backends.de.po: Update.
+
 2006-06-06  m. allan noah <anoah AT pfeiffer DOT edu>

 	* backend/fujitsu.[ch]: update to v1.0.30, init more models,
@ -68,21 +78,20 @@
 	* doc/descriptions/fujitsu.desc: minor update
 	* doc/sane-fujitsu.man: minor text changes, note DBG levels

-2006-5-28  Gerhard Jaeger <gerhard@gjaeger.de>
+2006-05-28  Gerhard Jaeger <gerhard@gjaeger.de>

-        * doc/sane-plustek_pp.man: Fixed typo.
-        * doc/sane-plustek.man: Update.
-        * doc/descriptions/plustek.desc: Update.
-        * backend/plustek.c backend/plustek.h backend/plustek-usb.c
-          backend/plustek-usbcal.c backend/plustek-usbcalfile.c
-          backend/plustek-usbdevs.c backend/plustek-usb.h
-          backend/plustek-usbhw.c backend/plustek-usbimg.c
-          backend/plustek-usbio.c backend/plustek-usbmap.c
-          backend/plustek-usbscan.c backend/plustek-usbshading.c:
-          Added support for CIS-based sheetfed scanners, namely
-          TravelScan662.
-          Added support for saving calibration data for CIS
-          devices - should speedup CanoScan devices.
+	* doc/sane-plustek_pp.man: Fixed typo.
+	* doc/sane-plustek.man: Update.
+	* doc/descriptions/plustek.desc: Update.
+	* backend/plustek.c backend/plustek.h backend/plustek-usb.c
+	  backend/plustek-usbcal.c backend/plustek-usbcalfile.c
+	  backend/plustek-usbdevs.c backend/plustek-usb.h
+	  backend/plustek-usbhw.c backend/plustek-usbimg.c
+	  backend/plustek-usbio.c backend/plustek-usbmap.c
+	  backend/plustek-usbscan.c backend/plustek-usbshading.c:
+	  Added support for CIS-based sheetfed scanners, namely TravelScan662.
+	  Added support for saving calibration data for CIS
+	  devices - should speedup CanoScan devices.

 2006-05-28  Wittawat Yamwong <wittawat@web.de>

--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@ -19,7 +19,7 @@ datadir = @datadir@
 sysconfdir = @sysconfdir@
 sharedstatedir = @sharedstatedir@
 localstatedir = @localstatedir@
-localstatesanedir = $(localstatedir)/lock/sane
+locksanedir = @locksanedir@
 libdir = @libdir@
 libsanedir = $(libdir)/sane
 infodir = @infodir@
@ -255,10 +255,10 @@ install-becfg:
 	 done

 install-lockpath:
-	$(MKDIR) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(localstatesanedir)
+	$(MKDIR) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)

 uninstall:
-	rm -rf $(libsanedir) $(configdir) $(localstatesanedir)
+	rm -rf $(libsanedir) $(configdir) $(locksanedir)
 	rm -f $(libdir)/libsane.*
 	-for dir in $(FIRMWARE_DIRS) ; do \
 	   rmdir $(datadir)/sane/$${dir} ; \
--- a/79
+++ b/79
@ -464,7 +464,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS V_MAJOR V_MINOR V_REV PACKAGE VERSION NUMBER_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP SANE_CONFIG_PATH MSGFMT XGETTEXT MSGMERGE LATEX DVIPS MAKEINDEX MAKEDEPEND DEPEND_RECURSIVE INCLUDES LINKER_RPATH DL_LIB DYNAMIC_FLAG USE_LINKS INSTALL_LOCKPATH LOCKPATH_GROUP HAVE_GPHOTO2 ac_ct_HAVE_GPHOTO2 GPHOTO2_LDFLAGS ALLOCA LIBOBJS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_LINK_EXTRA SANED SANEI_JPEG SANEI_JPEG_LO BACKENDS DLL_PRELOAD BEOS_ADDONDIR BE_INSTALL_FLAVOR INSTALL_TRANSLATIONS USE_LATEX DISTCLEAN_FILES LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS V_MAJOR V_MINOR V_REV PACKAGE VERSION NUMBER_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP SANE_CONFIG_PATH MSGFMT XGETTEXT MSGMERGE LATEX DVIPS MAKEINDEX MAKEDEPEND DEPEND_RECURSIVE INCLUDES LINKER_RPATH DL_LIB DYNAMIC_FLAG USE_LINKS INSTALL_LOCKPATH LOCKPATH_GROUP HAVE_GPHOTO2 ac_ct_HAVE_GPHOTO2 GPHOTO2_LDFLAGS ALLOCA LIBOBJS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_LINK_EXTRA locksanedir SANED SANEI_JPEG SANEI_JPEG_LO BACKENDS DLL_PRELOAD BEOS_ADDONDIR BE_INSTALL_FLAVOR INSTALL_TRANSLATIONS USE_LATEX DISTCLEAN_FILES LTLIBOBJS'
 ac_subst_files=''

 # Initialize some variables set by options.
@ -1066,6 +1066,7 @@ Optional Packages:
                          both]
  --with-tags[=TAGS]
                          include additional configurations [automatic]
+  --with-lockdir=DIR      set SANE lockdir [localstatedir/lock/sane]

 Some influential environment variables:
  CC          C compiler command
@ -11198,7 +11199,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 11201 "configure"' > conftest.$ac_ext
+  echo '#line 11202 "configure"' > conftest.$ac_ext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@ -12437,7 +12438,7 @@ fi


 # Provide some information about the compiler.
-echo "$as_me:12440:" \
+echo "$as_me:12441:" \
     "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@ -13539,11 +13540,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13542: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13543: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:13546: \$? = $ac_status" >&5
+   echo "$as_me:13547: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -13801,11 +13802,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13804: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13805: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:13808: \$? = $ac_status" >&5
+   echo "$as_me:13809: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -13863,11 +13864,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13866: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13867: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:13870: \$? = $ac_status" >&5
+   echo "$as_me:13871: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -16103,7 +16104,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 16106 "configure"
+#line 16107 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -16201,7 +16202,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 16204 "configure"
+#line 16205 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -18453,11 +18454,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18456: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18457: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:18460: \$? = $ac_status" >&5
+   echo "$as_me:18461: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -18515,11 +18516,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18518: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18519: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:18522: \$? = $ac_status" >&5
+   echo "$as_me:18523: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -19884,7 +19885,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 19887 "configure"
+#line 19888 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -19982,7 +19983,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 19985 "configure"
+#line 19986 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -20867,11 +20868,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20870: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20871: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:20874: \$? = $ac_status" >&5
+   echo "$as_me:20875: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -20929,11 +20930,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20932: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20933: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:20936: \$? = $ac_status" >&5
+   echo "$as_me:20937: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -23055,11 +23056,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:23058: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:23059: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:23062: \$? = $ac_status" >&5
+   echo "$as_me:23063: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -23317,11 +23318,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:23320: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:23321: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:23324: \$? = $ac_status" >&5
+   echo "$as_me:23325: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@ -23379,11 +23380,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:23382: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:23383: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:23386: \$? = $ac_status" >&5
+   echo "$as_me:23387: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -25619,7 +25620,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 25622 "configure"
+#line 25623 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -25717,7 +25718,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 25720 "configure"
+#line 25721 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -26774,9 +26775,19 @@ if test "$ac_cv_header_windows_h" = "yes" -o "$ac_cv_header_be_kernel_OS_h" = "y
 fi


+
+# Check whether --with-lockdir or --without-lockdir was given.
+if test "${with_lockdir+set}" = set; then
+  withval="$with_lockdir"
+  locksanedir=$withval
+else
+  locksanedir=${localstatedir}/lock/sane
+fi;
+
+
 CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
 	  -DPATH_SANE_DATA_DIR=\$(datadir) \
-	  -DPATH_SANE_LOCK_DIR=\$(localstatedir) \
+	  -DPATH_SANE_LOCK_DIR=\$(locksanedir) \
 	  -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"

 if test "${ac_cv_header_sys_socket_h}" = "no"; then
@ -26806,10 +26817,9 @@ echo "$as_me: Manually selected backends: ${BACKENDS}" >&6;}
          epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek \
          microtek2 mustek mustek_usb nec pie pixma plustek \
          plustek_pp ricoh s9036 sceptre sharp \
-          sp15c st400 stv680 \
-	  tamarack test teco1 teco2 teco3 umax umax_pp umax1220u \
+          sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u \
          artec_eplus48u ma1509 ibm hp5400 u12 snapscan niash sm3840 hp4200 \
-          sm3600 hp3500"
+          sm3600 hp3500 stv680"

  if test "${sane_cv_use_libjpeg}" != "yes"; then
    echo "*** disabling DC210 backend (failed to find JPEG library)"
@ -27691,6 +27701,7 @@ s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
 s,@LIBTOOL_LINK_EXTRA@,$LIBTOOL_LINK_EXTRA,;t t
+s,@locksanedir@,$locksanedir,;t t
 s,@SANED@,$SANED,;t t
 s,@SANEI_JPEG@,$SANEI_JPEG,;t t
 s,@SANEI_JPEG_LO@,$SANEI_JPEG_LO,;t t
@ -28211,7 +28222,7 @@ echo "Binaries:      `eval eval echo ${bindir}` and `eval eval echo ${sbindir}`"
 echo "Manpages:      `eval eval echo ${mandir}`"
 echo "Documentation: `eval eval echo ${docdir}`"
 if eval "test x$INSTALL_LOCKPATH = xinstall-lockpath" ; then
-  echo "Lockfiles:     `eval eval echo ${localstatedir}/lock/sane`"
+  echo "Lockfiles:     `eval eval echo ${locksanedir}`"
 else
  echo "Lockfiles:     Feature is disabled!"
 fi
--- a/configure.in
+++ b/configure.in
@ -305,14 +305,20 @@ if test "$ac_cv_header_windows_h" = "yes" -o "$ac_cv_header_be_kernel_OS_h" = "y
  AC_SUBST(LIBTOOL_LINK_EXTRA)
 fi

+dnl Check for lock dir
+
+AC_ARG_WITH(lockdir, AC_HELP_STRING([--with-lockdir=DIR],
+                                    [set SANE lockdir @<:@localstatedir/lock/sane@:>@]),
+                                    [locksanedir=$withval],[locksanedir=${localstatedir}/lock/sane])
+AC_SUBST(locksanedir)
+
 dnl ***********************************************************************
 dnl enable/disable backends and features based on previous tests and user's
 dnl choice
 dnl ***********************************************************************
-
 CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
 	  -DPATH_SANE_DATA_DIR=\$(datadir) \
-	  -DPATH_SANE_LOCK_DIR=\$(localstatedir) \
+	  -DPATH_SANE_LOCK_DIR=\$(locksanedir) \
 	  -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"

 if test "${ac_cv_header_sys_socket_h}" = "no"; then
@ -544,7 +550,7 @@ echo "Binaries:      `eval eval echo ${bindir}` and `eval eval echo ${sbindir}`"
 echo "Manpages:      `eval eval echo ${mandir}`"
 echo "Documentation: `eval eval echo ${docdir}`"
 if eval "test x$INSTALL_LOCKPATH = xinstall-lockpath" ; then
-  echo "Lockfiles:     `eval eval echo ${localstatedir}/lock/sane`"
+  echo "Lockfiles:     `eval eval echo ${locksanedir}`"
 else
  echo "Lockfiles:     Feature is disabled!"
 fi
--- a/include/sane/sanei_access.h
+++ b/include/sane/sanei_access.h
@ -67,11 +67,11 @@ extern void sanei_access_init( const char * backend );
 /** Set a lock.
 *
 * The function tries to open/create exclusively a lock file in 
- * $PATH_SANE_LOCK_DIR/lock/sane.
+ * $PATH_SANE_LOCK_DIR.
 * If the file could be created successfully, the function fills in the
 * process ID.
 * The complete filename of the lockfile is created as follows:
- * $PATH_SANE_LOCK_DIR/lock/LCK..<devicename>
+ * $PATH_SANE_LOCK_DIR/LCK..<devicename>
 * If the lock could not be set, the function tries it until the timeout
 * period has been elapsed.
 *
--- a/po/sane-backends.de.po
+++ b/po/sane-backends.de.po
@ -2,7 +2,7 @@
 # German translation for SANE backend options
 # Copyright (C) 2002-2005 SANE Project.
 # Burma Group Karlsruhe, Heiko Schaefer <heiko@burmagroup.de>, 2002.
-# Gerhard Jaeger <gerhard@gjaeger.de>, 2002,2004, 2005.
+# Gerhard Jaeger <gerhard@gjaeger.de>, 2002-2006.
 # Henning Meier-Geinitz <henning@meier-geinitz.de>, 2002-2005.
 # Michael Herder <crapsite@gmx.net>, 2002.
 # Oliver Rauch <Oliver.Rauch@Rauch-domain.de>, 2002.
@ -669,7 +669,7 @@ msgid ""
 "After sending the scan command, wait until the button on the scanner is "
 "pressed to actually start the scan process."
 msgstr ""
-"Beginne mit dem Scannen erst, wenn nach dem Senden des Scankommandos des "
+"Beginne mit dem Scannen erst, wenn nach dem Senden des Scankommandos der "
 "Knopf am Scanner gedrückt wird."

 #: .tmp/genesys.c:96 .tmp/gt68xx.c:145 .tmp/ma1509.c:106 .tmp/mustek.c:158
@ -1979,9 +1979,9 @@ msgid "Enables or disables calibration data cache."
 msgstr "Schaltet Kalibrierungsdatenspeicher ein oder aus."

 #: .tmp/plustek.c:929
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Performs calibration"
-msgstr "Grobkalibrierung"
+msgstr "Führt Kalibrierung durch"

 #: .tmp/plustek.c:947
 #, no-c-format
--- a/sanei/Makefile.in
+++ b/sanei/Makefile.in
@ -18,6 +18,7 @@ datadir = @datadir@
 sysconfdir = @sysconfdir@
 sharedstatedir = @sharedstatedir@
 localstatedir = @localstatedir@
+locksanedir = @locksanedir@
 libdir = @libdir@
 infodir = @infodir@
 mandir = @mandir@
--- a/sanei/sanei_access.c
+++ b/sanei/sanei_access.c
@ -133,7 +133,7 @@ create_lock_filename( char *fn, const char *devname )
 {
 	char *p;

-	strcpy( fn, STRINGIFY(PATH_SANE_LOCK_DIR)"/lock/sane/LCK.." );
+	strcpy( fn, STRINGIFY(PATH_SANE_LOCK_DIR)"/LCK.." );
 	p = &fn[strlen(fn)];

 	strcat( fn, devname );