From c03c626ecb5ad285dbfc126fec46d2b94bf23a16 Mon Sep 17 00:00:00 2001 From: Paulius Zaleckas Date: Tue, 6 Apr 2010 23:36:53 +0300 Subject: [PATCH] matchbox-desktop: fix compilation and installation Libtool patch applies just fine. mbdesktop_modules is installed by the matchbox-desktop and we don't have to overwrite it with our copy(contains wrong paths). Signed-off-by: Paulius Zaleckas Signed-off-by: Peter Korsgaard --- package/matchbox/matchbox-desktop/matchbox-desktop.mk | 7 ------- package/matchbox/matchbox-desktop/mbdesktop_modules | 9 --------- 2 files changed, 16 deletions(-) delete mode 100644 package/matchbox/matchbox-desktop/mbdesktop_modules diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk index a3312af829..d5f61c1f13 100644 --- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk +++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk @@ -7,16 +7,9 @@ MATCHBOX_DESKTOP_VERSION = 0.9.1 MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2 MATCHBOX_DESKTOP_SITE = http://matchbox-project.org/sources/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION) -MATCHBOX_DESKTOP_LIBTOOL_PATCH = NO MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib MATCHBOX_DESKTOP_CONF_OPT = --enable-expat -define MATCHBOX_DESKTOP_POST_INSTALL_FIXES - cp -f ./package/matchbox/matchbox-desktop/mbdesktop_modules $(TARGET_DIR)/etc/matchbox/ -endef - -MATCHBOX_DESKTOP_POST_INSTALL_TARGET_HOOKS += MATCHBOX_DESKTOP_POST_INSTALL_FIXES - ############################################################# ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) diff --git a/package/matchbox/matchbox-desktop/mbdesktop_modules b/package/matchbox/matchbox-desktop/mbdesktop_modules deleted file mode 100644 index 8206dad1f0..0000000000 --- a/package/matchbox/matchbox-desktop/mbdesktop_modules +++ /dev/null @@ -1,9 +0,0 @@ -# This file lists the 'plug-ins' with any arguments to be loaded by -# matchbox-desktop. -# -# It can be overridden on a per-user basis by copying this file to ~/.matchbox/ -# and editing. - -/usr/lib/tasks.so -/usr/lib/dotdesktop.so -# /usr/lib/simplefilebrowser.so / -- 2.30.2