From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sun, 23 Nov 2008 00:15:57 +0000 (+0000)
Subject: Cleanup xsetroot package.
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=ca54af8d9a72d916a190da7340b3c856af8e7d99;ds=sidebyside

Cleanup xsetroot package.


SVN-Revision: 13323
---

diff --git a/Xorg/app/xsetroot/Makefile b/Xorg/app/xsetroot/Makefile
index 6a5b24e0b4..aa101780cb 100644
--- a/Xorg/app/xsetroot/Makefile
+++ b/Xorg/app/xsetroot/Makefile
@@ -1,23 +1,26 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=xsetroot
 PKG_NAME:=xsetroot
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.2
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL:=1
+
+TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
 define Package/xsetroot
   SECTION:=xorg-app
   CATEGORY:=Xorg
@@ -27,20 +30,11 @@ define Package/xsetroot
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Build/Compile
-	DESTDIR=$(PKG_INSTALL_DIR) make -C $(PKG_BUILD_DIR) install
-endef
-
 define Package/xsetroot/install
-	$(INSTALL_DIR) $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-	rm -rf $(1)/usr/man/
-endef
-
-define Build/InstallDev
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/bin/* \
+		$(1)/usr/bin
 endef
 
 $(eval $(call BuildPackage,xsetroot))