From 8be6fc45a9d10d9cb604b08244855c8bec259e0a Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sun, 23 Nov 2008 00:16:34 +0000 Subject: [PATCH] Cleanup xeyes package. SVN-Revision: 13324 --- Xorg/app/xeyes/Makefile | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/Xorg/app/xeyes/Makefile b/Xorg/app/xeyes/Makefile index 7ebdd94979..fa8a2149ec 100644 --- a/Xorg/app/xeyes/Makefile +++ b/Xorg/app/xeyes/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:=xeyes PKG_NAME:=xeyes -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_VERSION:=1.0.1 -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/xeyes SECTION:=xorg-app CATEGORY:=Xorg @@ -27,20 +30,11 @@ define Package/xeyes 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/xeyes/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_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin endef $(eval $(call BuildPackage,xeyes)) -- 2.30.2