Update comedilib's econf call to use EPREFIX and fix localstatedir.

diff --git a/ChangeLog b/ChangeLog
index e361f4334aabc0ab546b253249d266c9beaf3979..a544aa4739382e1f8abef539f0a54ddad5d849c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/comedilib/Attic/ChangeLog,v 1.3 2006/03/13 17:51:20 caleb dead $
 
+*comedilib-9999 (08 Feb 2011)
+
+  08 Feb 2011; W. Trevor King <wking@drexel.edu> comedilib-9999.ebuild :
+  - Add EPREFIX to econf path configuration.
+  - Adjust localstatedir to fix comedi_get_default_calibration_path,
+    which uses
+      LOCALSTATEDIR "/lib/comedi/calibrations/%s_%s_comedi%li"
+    but econf by default uses
+      --localstatedir="${EPREFIX}"/var/lib
+    With the adjustment, the default calibration file is
+      /var/lib/comedi/...
+    not
+      /var/lib/lib/comedi/...
+
 *comedilib-9999 (31 Dec 2010)
 
   31 Dec 2010; W. Trevor King <wking@drexel.edu> comedilib-9999.ebuild :

diff --git a/Manifest b/Manifest
index 93ac8762dc7c5c796b7957f6e2c7f93eecad94a1..47e9543caf0d8ac677928fe5d123a7eb2acff080 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,4 +1,4 @@
 AUX comedilib-9999-demo-Makefile.patch 2505 RMD160 76278a724696a5fc3f4fb9e1b297018b6ce83953 SHA1 bc3401ed2c69ac87144621eba6bbe825b16e679f SHA256 25fd857769c8c5390289db546cd8e7686372edcdbdea0ffd989b45689a8ba6b1
-EBUILD comedilib-9999.ebuild 3668 RMD160 8cb21562a3b86b5ac2a23dd986968f1876b762b0 SHA1 4ae4b390cde56ec5747fe9e6f26bc6c4c660158a SHA256 a66f2a3398c70c066c6dba6943dfb93188f9b00fb49ab552a718915bb727276a
-MISC ChangeLog 1370 RMD160 5151951a42307c9b2f53d48780c01a216c2cc5df SHA1 5ece3fb640a6a99d7d1bf750683156530d9e7fed SHA256 d694b2b121dec0dc7b2f6e441c5fd7eb2126b7bf0b211aedba51a35148b18891
+EBUILD comedilib-9999.ebuild 3725 RMD160 536b156ef81c64aab519458f42cca9b792ef79d7 SHA1 4143f3181ba1a0c181a16ce1379e5a2fbd80b121 SHA256 930ec3aa67d74c850444eeee078bf1039602b41a44f3056223c27dff433f4f3d
+MISC ChangeLog 1861 RMD160 f3f6aa80a3f0f9805a63f4528703a06369aad7ad SHA1 a23c7ef0643021caef793269b931155c27e2a0c6 SHA256 91ebdad9ee8a8289a92b57b6d0f7dc997c59b984695c64e308d4075ac13b80d1
 MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72

diff --git a/comedilib-9999.ebuild b/comedilib-9999.ebuild
index 1855f9ee65587452168b3a53074d1273eca613c7..c494621f97ea07a2c4f6f778ca758d8275bc3277 100644 (file)
--- a/comedilib-9999.ebuild
+++ b/comedilib-9999.ebuild
@@ -63,8 +63,9 @@ src_configure()
        #$(use_enable python python-binding)
        #$(use_enable ruby ruby-binding)
        econf \
-               --sysconfdir="/usr/share/doc/${PF}/etc" \
-               --docdir="/usr/share/doc/${PF}" \
+               --sysconfdir="${EPREFIX}/usr/share/doc/${PF}/etc" \
+               --localstatedir="${EPREFIX}/var" \
+               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
                --disable-python-binding \
                --disable-ruby-binding \
                $(use_enable doc docbook) \