From 3ed3b69efe6e85bc599571c7af058c2d6ffffe53 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Jan 2013 11:29:38 +0000 Subject: xvkbd: turn into a generic-package xvkbd was integrated has an autotools package, but it does not have a ./configure script. And to avoid executing the ./configure, the xvkbd-2.8-makefile.patch was creating a dummy .stamp_configured stamp file... Ugly. So, make xvkbd a normal generic package, with BUILD_CMDS and INSTALL_TARGET_CMDS, and get rid of the crappy part of the patch. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/xvkbd/xvkbd.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'package/xvkbd/xvkbd.mk') diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk index ae81f84d3..59085bf73 100644 --- a/package/xvkbd/xvkbd.mk +++ b/package/xvkbd/xvkbd.mk @@ -7,8 +7,16 @@ XVKBD_VERSION = 3.2 XVKBD_SOURCE = xvkbd-$(XVKBD_VERSION).tar.gz XVKBD_SITE = http://homepage3.nifty.com/tsato/xvkbd -XVKBD_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_CC)" \ - CFLAGS="-O2 -I$(STAGING_DIR)/usr/include" USRLIBDIR="$(STAGING_DIR)/usr/lib" +# Passing USRLIBDIR ensures that the stupid Makefile doesn't add +# /usr/lib to the library search path. +define XVKBD_BUILD_CMDS + $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + USRLIBDIR="$(STAGING_DIR)/usr/lib" +endef + +define XVKBD_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef XVKBD_DEPENDENCIES = \ xlib_libICE \ @@ -21,5 +29,5 @@ XVKBD_DEPENDENCIES = \ xlib_libXt \ xlib_libXtst -$(eval $(autotools-package)) +$(eval $(generic-package)) -- cgit v1.2.3