AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix broken DESTDIR support

Browse Source 
svn path=/trunk/; revision=17907
This commit is contained in:
Matthias Clasen 2007-05-24 19:43:05 +00:00
parent 5a1a2cf44c
commit fc9a5caba2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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

4
modules/input/Makefile.am
View File

@ -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