Author: ek.kato
Date: Tue Jun 23 02:52:13 2009
New Revision: 5964
Modified:
branches/1.5/ (props changed)
branches/1.5/configure.ac
branches/1.5/qt4/immodule/Makefile.am
Log:
* Port r5963 from trunk.
Modified: branches/1.5/configure.ac
==============================================================================
--- branches/1.5/configure.ac (original)
+++ branches/1.5/configure.ac Tue Jun 23 02:52:13 2009
@@ -731,13 +731,13 @@
use_applet_gnome="no"
;;
yes|*)
- PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0,
use_applet_gnome="yes",use_applet_gnome="no")
+ PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0 libgnomeui-2.0,
use_applet_gnome="yes",use_applet_gnome="no")
PKG_CHECK_MODULES(APPLET_2_14, libpanelapplet-2.0 >= 2.14.0,
panelapplet_have_set_background_api="yes",panelapplet_have_set_background_api="no")
;;
esac
],
[
- PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0,
use_applet_gnome="yes",use_applet_gnome="no")
+ PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0 libgnomeui-2.0,
use_applet_gnome="yes",use_applet_gnome="no")
PKG_CHECK_MODULES(APPLET_2_14, libpanelapplet-2.0 >= 2.14.0,
panelapplet_have_set_background_api="yes",panelapplet_have_set_background_api="no")
])
Modified: branches/1.5/qt4/immodule/Makefile.am
==============================================================================
--- branches/1.5/qt4/immodule/Makefile.am (original)
+++ branches/1.5/qt4/immodule/Makefile.am Tue Jun 23 02:52:13 2009
@@ -3,7 +3,7 @@
# Makefile.qmake is only exist when --enable-qt4-immodule
if QT4_IMMODULE
all clean mocclean install uninstall:
- $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@
+ $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake INSTALL_ROOT=$(DESTDIR) $@
# *.pro is required to run Makefile.qmake. So distclean-am is deferred.
distclean:
