bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix xinit install. It failed if it was run twice.

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@12661 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
lars 2008-09-23 14:24:46 +00:00
parent 333257fb94
commit 2ca9fe3103
1 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
XOrg/app/xinit/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2007 OpenWrt.org # Copyright (C) 2007-2008 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -16,18 +16,15 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
_DEPEND:= +libX11
ifneq (xinit,xinit)
_DEPEND+=xorg-server-essentials
endif
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
PKG_INSTALL=1
define Package/xinit define Package/xinit
SECTION:=xorg-app SECTION:=xorg-app
CATEGORY:=Xorg CATEGORY:=Xorg
SUBMENU:=app SUBMENU:=app
DEPENDS:=${_DEPEND} @DISPLAY_SUPPORT DEPENDS:=libX11 @DISPLAY_SUPPORT
TITLE:=xinit TITLE:=xinit
URL:=http://xorg.freedesktop.org/ URL:=http://xorg.freedesktop.org/
endef endef
@ -36,27 +33,12 @@ define Build/InstallDev
DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
endef endef
ifeq (xinit,xdm)
CONFIGURE_ARGS+=--with-random-device=/dev/urandom
endif
CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
define Build/Compile
make -C $(PKG_BUILD_DIR)
make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
endef
define Package/xinit/install
$(INSTALL_DIR) $(1)
$(CP) $(PKG_INSTALL_DIR)/* $(1)
rm -rf $(1)/usr/man/
endef
define Package/xinit/install define Package/xinit/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
cd $(1)/usr/bin/; ln -s xinit startx cd $(1)/usr/bin/; ln -sf xinit startx
endef endef
$(eval $(call BuildPackage,xinit)) $(eval $(call BuildPackage,xinit))