Fix broken DESTDIR support

svn path=/trunk/; revision=17907

diff --git a/ChangeLog b/ChangeLog
index 3725c45488acf6817448bf1f8e85373326f9156f..3f8ea2f9b2a7f99d24ea4f26dcc6ee08b644ca73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-24  Matthias Clasen  <mclasen@redhat.com>
+
+       * modules/input/Makefile.am: Fix broken DESTDIR support
+
 2007-05-24  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtktooltip.c (find_widget_under_pointer): apply patch from

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index b30c8c6a1a8a8d3d397a865a15cd7ef8a5080527..c7510046d32c618e57d12e75d87f2a05b6481614 100644 (file)
--- 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