[arch-commits] Commit in libgphoto2/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Monday, June 8, 2009 @ 16:44:33
  Author: jgc
Revision: 41984

Merged revisions 41983 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/libgphoto2/trunk

........
  r41983 | jgc | 2009-06-08 22:43:52 +0200 (Mon, 08 Jun 2009) | 1 line
  
  Fix link patch when running the print-camera-list binary (FS#14999)
........

Modified:
  libgphoto2/repos/extra-i686/	(properties)
  libgphoto2/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Property changes on: libgphoto2/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /libgphoto2/trunk:1-40217
   + /libgphoto2/trunk:1-41983

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-06-08 20:43:52 UTC (rev 41983)
+++ extra-i686/PKGBUILD	2009-06-08 20:44:33 UTC (rev 41984)
@@ -25,12 +25,12 @@
   
   install -m755 -d "${pkgdir}/usr/share/hal/fdi/information/20thirdparty"
   install -m755 -d "${pkgdir}/etc/udev/rules.d"
-  LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH}${pkgdir}/usr/lib" \
+  LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
   CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
       "${pkgdir}/usr/lib/libgphoto2/print-camera-list" hal-fdi > \
       "${pkgdir}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" || return 1
 
-  LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH}${pkgdir}/usr/lib" \
+  LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
   CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
       "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 0.98 group camera mode 0660 > \
       "${pkgdir}/etc/udev/rules.d/54-gphoto.rules" || return 1