From fc9a5caba25e1f50314608071263baf6f23fcdad Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 24 May 2007 19:43:05 +0000 Subject: [PATCH] Fix broken DESTDIR support svn path=/trunk/; revision=17907 --- ChangeLog | 4 ++++ modules/input/Makefile.am | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3725c45488..3f8ea2f9b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-05-24 Matthias Clasen + + * modules/input/Makefile.am: Fix broken DESTDIR support + 2007-05-24 Michael Natterer * gtk/gtktooltip.c (find_widget_under_pointer): apply patch from diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index b30c8c6a1a..c7510046d3 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -91,7 +91,7 @@ if USE_WIN32 IM_IME_MODULE=im-ime.la endif -multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(DESTDIR)$(sysconfdir)/gtk-2.0"\" +multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\" im_multipress_la_CPPFLAGS = $(multipress_defs) im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_multipress_la_SOURCES = \ @@ -100,7 +100,7 @@ im_multipress_la_SOURCES = \ immultipress.c im_multipress_la_LIBADD = $(LDADDS) -imconffiledir = $(DESTDIR)$(sysconfdir)/gtk-2.0 +imconffiledir = $(sysconfdir)/gtk-2.0 dist_imconffile_DATA = im-multipress.conf if CROSS_COMPILING