pwrtray: Update to support lock button

[openwrt/svn-archive/archive.git] / Xorg / app / pwrtray / Makefile

diff --git a/Xorg/app/pwrtray/Makefile b/Xorg/app/pwrtray/Makefile
index 7264abb8e3fcff2e29e9f271f2c74d4e9ac64a7f..788d5bac0ea832b284c90b4548ad5db2b1d3c58f 100644 (file)
--- a/Xorg/app/pwrtray/Makefile
+++ b/Xorg/app/pwrtray/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pwrtray
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pwrtray

-PKG_REV:=89c0d75ecb9efdb7ef2288635d617348c1fe5480
+PKG_REV:=36b80fb91a863555a5608972df19574644e67c4d

 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 
 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 


@@ -28,7 +28,7 @@ define Package/pwrtray
   SUBMENU:=app
   TITLE:=pwrtray
   URL:=http://bu3sch.de/gitweb?p=pwrtray.git;a=summary
   SUBMENU:=app
   TITLE:=pwrtray
   URL:=http://bu3sch.de/gitweb?p=pwrtray.git;a=summary

-  DEPENDS:=+qt4
+  DEPENDS:=+qt4 +qt4-gui

 endef
 
 define Package/pwrtray/description
 endef
 
 define Package/pwrtray/description


@@ -36,7 +36,9 @@ define Package/pwrtray/description
 endef
 
 EXTRA_CFLAGS:= \
 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 \
 
 EXTRA_LDFLAGS:= \
        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \


@@ -50,9 +52,13 @@ MAKE_VARS+= \
 #      V=1
 
 define Package/pwrtray/install
 #      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/

        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray $(1)/usr/bin/
        $(CP) $(PKG_INSTALL_DIR)/usr/share/pwrtray $(1)/usr/share/
        $(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))
 endef
 
 $(eval $(call BuildPackage,pwrtray))