X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Xorg%2Fwm%2Fmatchbox-window-manager%2FMakefile;h=bbb940c17e79c68791ea23c2a8608775e93caeca;hp=e59d5c35093e89fc78c4366fa21218d2046f456c;hb=9044128e3dbb15159fa92a8d6eb90d2c8a35ef74;hpb=71e5a1a08b46987c47f7f3c665b595f35fca8dfc

diff --git a/Xorg/wm/matchbox-window-manager/Makefile b/Xorg/wm/matchbox-window-manager/Makefile
index e59d5c3509..bbb940c17e 100644
--- a/Xorg/wm/matchbox-window-manager/Makefile
+++ b/Xorg/wm/matchbox-window-manager/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -13,9 +13,8 @@ PKG_VERSION:=1.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://matchbox-project.org/sources/matchbox-window-manager/$(PKG_VERSION)
-
-PKG_FIXUP = libtool
+PKG_SOURCE_URL:=http://matchbox-project.org/sources/$(PKG_NAME)/$(PKG_VERSION)
+PKG_FIXUP:=libtool
 
 TARGET_LDFLAGS+= \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
@@ -34,14 +33,42 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		LIBMB_LIBS="-L$(STAGING_DIR)/usr/lib -lfontconfig -lXrender -lz -lexpat -lfreetype -lXft -lmb -lX11 -lXext -lXau -lXdmcp -lpng12" \
+		DESTDIR=$(PKG_INSTALL_DIR) \
+		LIBMB_LIBS="$(TARGET_LDFLAGS) -lfontconfig -lXrender \
+		-lz -lexpat -lfreetype -lXft -lmb -lX11 -lXext -lXau -lXdmcp \
+		-lpng12" \
 		all install 
 endef
 
 define Package/matchbox-window-manager/install
-	$(INSTALL_DIR) $(1)/
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/matchbox
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/etc/matchbox/kbdconfig \
+		$(1)/etc/matchbox/
+
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/* \
+		$(1)/usr/bin/
+	
+	$(INSTALL_DIR) $(1)/usr/share/{matchbox,themes}
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/share/matchbox/* \
+		$(1)/usr/share/matchbox/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/share/themes/* \
+		$(1)/usr/share/themes/
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DATA) \
+		./files/uci-defaults/x11 \
+		$(1)/etc/uci-defaults/
+endef
+
+define Package/matchbox-window-manager/postinst
+	#!/bin/sh
+	[ -n "$${IPKG_INSTROOT}" ] && exit
+	. /etc/functions.sh
+	uci_apply_defaults
 endef
 
 $(eval $(call BuildPackage,matchbox-window-manager))