get_libdir updates.
authorJeremy Huddleston <eradicator@gentoo.org>
Thu, 18 Nov 2004 08:10:41 +0000 (08:10 +0000)
committerJeremy Huddleston <eradicator@gentoo.org>
Thu, 18 Nov 2004 08:10:41 +0000 (08:10 +0000)
x11-misc/linuxwacom/Manifest
x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild

index c50ffa0493de7d191bc20f4a110ce743f0f82f80..43a75efc70711b3563c5534e5be37c03543d4ab2 100644 (file)
@@ -5,7 +5,7 @@ MD5 eba6549a73f015017781780283e5f36c ChangeLog 2926
 MD5 c2f927beefe923be43b483186af5c2d2 linuxwacom-0.6.2.ebuild 3241
 MD5 70ea4ce06ce2c28cd4c3526a20d08c29 linuxwacom-0.6.3.ebuild 3239
 MD5 3dd5cf5937673ddb13343671c7df2409 metadata.xml 260
-MD5 2c8fe5a650a0e30ef25dec6e17a6c1cc linuxwacom-0.6.4.ebuild 3520
+MD5 6e68bdf6007882909dd2c28ac6a83813 linuxwacom-0.6.4.ebuild 3552
 MD5 270159aa127b9370f0e66f2ccaebd7c7 files/digest-linuxwacom-0.6.2 69
 MD5 78a65c4833619b5ad2df32981808eb6a files/digest-linuxwacom-0.6.3 69
 MD5 845ee9f0e43d25914f1483ce14c7d692 files/digest-linuxwacom-0.6.4 69
@@ -13,7 +13,7 @@ MD5 460388794b55a5e57d127858eea80bcc files/linuxwacom-0.6.4-nonx86.patch 1739
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBnFfpArHZZzCEUG0RAso0AJ9gia96gMaLm9thyiicSyOTLz+01wCfU/XG
-gIrxA0BK9sHnJQPWfCwxbY8=
-=sROO
+iD8DBQFBnFkLArHZZzCEUG0RAhLiAJ9LEg+t9OTyTt8vmaYqNFq4Fo2d2QCfVYH4
+ZTyNv+Kk/EVP2EN96mapLP8=
+=msiq
 -----END PGP SIGNATURE-----
index 29bbde803ee7f8a13c179c0d8ab639fd7974525b..0c3a60d7e31eaf5a85dad316aa05f61ae327a042 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild,v 1.3 2004/11/18 08:05:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild,v 1.4 2004/11/18 08:10:41 eradicator Exp $
 
 IUSE="gtk gtk2 tcltk sdk"
 
@@ -102,14 +102,14 @@ src_compile() {
        fi
 
        if use sdk; then
-               myconf="--enable-wacomdrv --enable-wacdump --enable-xsetwacom --with-xf86=/usr/X11R6/lib/Server $withgtk $withtcltk"
+               myconf="--enable-wacomdrv --enable-wacdump --enable-xsetwacom --with-xf86=/usr/X11R6/$(get_libdir)/Server $withgtk $withtcltk"
                econf ${myconf} || die "configure failed."
 
                # Makefile fix for build against SDK
                cd ${S}/src
                cp Makefile Makefile.orig
-               sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/lib/Server:" Makefile
-               sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/lib/Server:" Makefile
+               sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/$(get_libdir)/Server:" Makefile
+               sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/$(get_libdir)/Server:" Makefile
                sed -i -e "s:/include/extensions:/include:g" Makefile
        else
                myconf="--disable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk"
@@ -120,7 +120,7 @@ src_compile() {
 }
 
 src_install() {
-       emake DESTDIR=${D} install || die "Install failed."
+       emake DESTDIR="${D}" install || die "Install failed."
        dohtml -r docs/*
        dodoc AUTHORS ChangeLog NEWS README
 }