From 83b68ed09ac20419eac57d1c1c3da6ded5939422 Mon Sep 17 00:00:00 2001 From: mmdolze Date: Sun, 11 Mar 2012 10:58:23 +0000 Subject: [PATCH] Work around a change in automake 1.11.3 that does not allow 'pkglibdir' to be used with 'PROGRAMS' any longer (#3494755). --- ChangeLog | 1 + server/drivers/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 71c52fb..d61f96a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ v0.5dev (ongoing development) * Fix RPM init script hanging on recent OS (#3488223) * lcdproc client: Fix build on OpenBSD >= 5.0 * hd44780/serial: Add support for adjustable backlight + * Build system: Fix build with automake >= 1.11.3 (#3494755) v0.5.5 + sed1330 driver: Add support for HG25504 (L. Lagendijk) diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am index 7711acc..4022197 100644 --- a/server/drivers/Makefile.am +++ b/server/drivers/Makefile.am @@ -21,7 +21,8 @@ AM_LDFLAGS = @LDSHARED@ ## Keep the lists sorted! -pkglib_PROGRAMS = @DRIVERS@ +lcdexecbindir = $(pkglibdir) +lcdexecbin_PROGRAMS = @DRIVERS@ EXTRA_PROGRAMS = bayrad CFontz CFontzPacket curses debug CwLnx ea65 EyeboxOne g15 glcd glcdlib glk hd44780 icp_a106 imon imonlcd IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD picolcd pyramid sdeclcd sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 SureElec svga t6963 text tyan sli ula200 vlsys_m428 xosd i2500vfd irtrans noinst_LIBRARIES = libLCD.a libbignum.a