X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Xorg%2Fapp%2Fpwrtray%2FMakefile;h=e4eaa3c8bcf96e1683ee2418d6312e37158b88ef;hp=a4297b7a85534d7528fbd4387b05118676d40b78;hb=fd530ab26ed831296c61463ca6216b248338c69a;hpb=49c57f87073ec9ce2e0270f64ca924409ea40cb8

diff --git a/Xorg/app/pwrtray/Makefile b/Xorg/app/pwrtray/Makefile
index a4297b7a85..e4eaa3c8bc 100644
--- a/Xorg/app/pwrtray/Makefile
+++ b/Xorg/app/pwrtray/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pwrtray
-PKG_REV:=89c0d75ecb9efdb7ef2288635d617348c1fe5480
+PKG_REV:=00222f1a487efcae711128c44aca499f4327743f
 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 
@@ -27,16 +27,19 @@ define Package/pwrtray
   CATEGORY:=Xorg
   SUBMENU:=app
   TITLE:=pwrtray
+  MAINTAINER:=Michael Buesch <mb@bu3sch.de>
   URL:=http://bu3sch.de/gitweb?p=pwrtray.git;a=summary
-  DEPENDS:=+qt4 +qt4-gui
+  DEPENDS:=+qt4 +qt4-gui +FEATURE_drawing-backend_libX11:libX11
 endef
 
 define Package/pwrtray/description
-  Tiny power control tray application.
+  Tiny system power control daemon with a small system-tray frontend.
 endef
 
 EXTRA_CFLAGS:= \
-	-I$(PKG_BUILD_DIR)/moc
+	-I$(PKG_BUILD_DIR)/tray/moc \
+	-I$(STAGING_DIR)/usr/include/QtCore \
+	-I$(STAGING_DIR)/usr/include/QtGui
 
 EXTRA_LDFLAGS:= \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
@@ -44,15 +47,21 @@ EXTRA_LDFLAGS:= \
 
 MAKE_VARS+= \
 	MOC="$(STAGING_DIR_HOST)/bin/moc" \
-	STRIP="$(STRIP)"
+	STRIP="$(STRIP)" \
+	$(if $(CONFIG_PACKAGE_libX11),FEATURE_XLOCK=y,FEATURE_XLOCK=n)
 
 #MAKE_FLAGS+= \
 #	V=1
 
 define Package/pwrtray/install
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share
+	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/bin $(1)/usr/share
+	$(INSTALL_BIN) ./files/etc/init.d/* $(1)/etc/init.d/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray-backend $(1)/usr/bin/
+	$(if $(CONFIG_PACKAGE_libX11),$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray-xlock $(1)/usr/bin/)
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray $(1)/usr/bin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/pwrtray $(1)/usr/share/
+	[ -e $(1)/etc/pwrtray-backendrc ] || \
+		$(INSTALL_DATA) ./files/etc/pwrtray-backendrc $(1)/etc/
 endef
 
 $(eval $(call BuildPackage,pwrtray))