xtscal: Install to the correct place

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2074 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-07-02 11:36:42 +00:00
parent c705da4f93
commit d3127fe250
2 changed files with 15 additions and 6 deletions

View File

@@ -1,3 +1,12 @@
---
Makefile.am | 9 --
configure.ac | 3
gpe-dist.am | 12 ---
h3600_ts.h | 216 -----------------------------------------------------------
main.c | 210 ++-------------------------------------------------------
xtscal.in | 19 -----
6 files changed, 14 insertions(+), 455 deletions(-)
Index: xtscal-0.6.3/xtscal.in
===================================================================
--- xtscal-0.6.3.orig/xtscal.in 2004-09-10 20:10:36.000000000 +0100
@@ -24,8 +33,8 @@ Index: xtscal-0.6.3/xtscal.in
-exec @libexecdir@/xtscal.bin $ARGS $*
Index: xtscal-0.6.3/main.c
===================================================================
--- xtscal-0.6.3.orig/main.c 2007-06-30 15:46:03.000000000 +0100
+++ xtscal-0.6.3/main.c 2007-06-30 15:46:03.000000000 +0100
--- xtscal-0.6.3.orig/main.c 2007-07-01 01:12:52.000000000 +0100
+++ xtscal-0.6.3/main.c 2007-07-01 01:12:55.000000000 +0100
@@ -22,12 +22,10 @@
#include <X11/Xlib.h>
@@ -340,7 +349,7 @@ Index: xtscal-0.6.3/main.c
Index: xtscal-0.6.3/configure.ac
===================================================================
--- xtscal-0.6.3.orig/configure.ac 2004-09-10 20:11:12.000000000 +0100
+++ xtscal-0.6.3/configure.ac 2007-06-30 15:46:03.000000000 +0100
+++ xtscal-0.6.3/configure.ac 2007-07-01 01:12:55.000000000 +0100
@@ -9,8 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Checks for programs.
AC_PROG_CC
@@ -592,11 +601,11 @@ Index: xtscal-0.6.3/h3600_ts.h
Index: xtscal-0.6.3/Makefile.am
===================================================================
--- xtscal-0.6.3.orig/Makefile.am 2004-06-02 23:07:13.000000000 +0100
+++ xtscal-0.6.3/Makefile.am 2007-06-30 15:46:03.000000000 +0100
+++ xtscal-0.6.3/Makefile.am 2007-07-02 12:51:02.000000000 +0100
@@ -1,11 +1,8 @@
-libexec_PROGRAMS = xtscal.bin
-bin_SCRIPTS = xtscal
+libexec_PROGRAMS = xtscal
+bin_PROGRAMS = xtscal
-xtscal_bin_SOURCES = main.c calibrate.c calibrate.h h3600_ts.h
+xtscal_SOURCES = main.c calibrate.c calibrate.h

View File

@@ -4,7 +4,7 @@ SECTION = "x11/base"
DEPENDS = "virtual/libx11 libxft libxcalibrate"
PR = "r5"
PR = "r6"
SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
file://change-cross.patch;patch=1 \