Changeset 16214


Ignore:
Timestamp:
2009-05-30T18:47:58+02:00 (9 years ago)
Author:
lars
Message:

[package] xdm: Cleanup the package and update it to 1.1.8. Fixes #4990

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/Xorg/app/xdm/Makefile

    r15967 r16214  
    99include $(TOPDIR)/rules.mk 
    1010 
    11 PKG_BASE_NAME:=xdm 
    1211PKG_NAME:=xdm 
    13 PKG_RELEASE:=3 
    14 PKG_VERSION:=1.1.6 
    15 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app 
     12PKG_RELEASE:=1 
     13PKG_VERSION:=1.1.8 
     14PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/app 
    1615PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1716PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ 
     17 
     18PKG_INSTALL:=1 
    1819 
    1920include $(INCLUDE_DIR)/package.mk 
     
    2829endef 
    2930 
    30 CONFIGURE_ARGS+=--with-random-device=/dev/urandom LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"  
     31TARGET_LDFLAGS+=\ 
     32        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ 
     33        -Wl,-rpath=/usr/lib 
    3134 
    32 define Build/Compile 
    33         DESTDIR=$(PKG_INSTALL_DIR) make -C $(PKG_BUILD_DIR) install 
     35define Build/Configure 
     36        $(call Build/Configure/Default, \ 
     37                --without-pam \ 
     38                --with-random-device=/dev/urandom \ 
     39                --disable-dynamic-greeter \ 
     40                --disable-xprint \ 
     41        ) 
    3442endef 
    3543 
    3644define Package/xdm/install 
    37         $(INSTALL_DIR) $(1) 
    38         $(CP) $(PKG_INSTALL_DIR)/* $(1)/ 
    39         rm -rf $(1)/usr/man/ 
    40 endef 
    41  
    42 define Build/InstallDev 
    43         $(CP) $(PKG_INSTALL_DIR)/* $(1)/ 
     45        $(INSTALL_DIR) $(1)/usr/{bin,lib/X11/xdm,share/X11/app-defaults} 
     46        $(INSTALL_BIN) \ 
     47                $(PKG_INSTALL_DIR)/usr/bin/* \ 
     48                $(1)/usr/bin/ 
     49        $(CP) \ 
     50                $(PKG_INSTALL_DIR)/usr/lib/X11/xdm/{X*,chooser,GiveConsole,TakeConsole,xdm-config,pixmaps} \ 
     51                $(1)/usr/lib/X11/xdm/ 
     52        $(INSTALL_DATA) \ 
     53                $(PKG_INSTALL_DIR)/usr/share/X11/app-defaults/* \ 
     54                $(1)/usr/share/X11/app-defaults/ 
    4455endef 
    4556 
Note: See TracChangeset for help on using the changeset viewer.