Merge openembedded@openembedded.bkbits.net:packages

into erichl.mine.nu:/home/erich/src/packages

2004/04/06 00:27:29-04:00 mine.nu!erich
tslib: install machine-specific ts.conf

BKrev: 407231e4aOPMJddGAmqMxDTyflGE5Q

diff --git a/tslib/tslib.oe b/tslib/tslib.oe
index 3b3eab7..cc8eed7 100644 (file)
--- a/tslib/tslib.oe
+++ b/tslib/tslib.oe
@@ -21,6 +21,7 @@ S = "${WORKDIR}/tslib"
 inherit autotools libtool
 
 EXTRA_OECONF = "--enable-shared"
+
 do_stage () {
        oe_soinstall src/.libs/libts-0.0.so.0.1.0 ${STAGING_LIBDIR}/
        ln -sf libts-0.0.so ${STAGING_LIBDIR}/libts.so
@@ -28,4 +29,8 @@ do_stage () {
        install -m 0644 src/tslib-private.h ${STAGING_INCDIR}/
 }
 
+do_install_prepend () {
+    oe_machinstall -m 0644 ${FILESDIR}/ts.conf ${S}/etc/ts.conf
+}
+
 FILES_tslib_append = " ${datadir}/ts/plugins/*.so"

diff --git a/tslib/tslib/collie/ts.conf b/tslib/tslib/collie/ts.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tslib/tslib/corgi/ts.conf b/tslib/tslib/corgi/ts.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tslib/tslib/h3600/ts.conf b/tslib/tslib/h3600/ts.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tslib/tslib/husky/ts.conf b/tslib/tslib/husky/ts.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tslib/tslib/poodle/ts.conf b/tslib/tslib/poodle/ts.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tslib/tslib/shepherd/ts.conf b/tslib/tslib/shepherd/ts.conf
new file mode 100644 (file)
index 0000000..e69de29