Changeset 20877


Ignore:
Timestamp:
2010-04-15T10:09:46+02:00 (7 years ago)
Author:
nico
Message:

[packages] pptpd: various fixes

  • enable bcrelay and package its binary (closes: #7150)
  • mark conffiles
  • add md5sum
  • use PKG_INSTALL
  • use $(CP) instead of $(INSTALL_BIN) for files installed by upstream 'make install'
  • cleanup
File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/pptpd/Makefile

    r19301 r20877  
    11#  
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=pptpd 
    1111PKG_VERSION:=1.3.4 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=@SF/poptop 
    16 #PKG_MD5SUM:=75d494e881f7027f4e60b114163f6b67 #1.3.0 
     16PKG_MD5SUM:=b38df9c431041922c997c1148bedf591 
     17 
     18PKG_INSTALL:=1 
    1719 
    1820include $(INCLUDE_DIR)/package.mk 
     
    2729endef 
    2830 
    29 define Build/Configure 
    30         $(call Build/Configure/Default, \ 
    31                 --with-bcrelay \ 
    32         ) 
    33 endef 
     31CONFIGURE_ARGS += \ 
     32        --enable-bcrelay \ 
    3433 
    35 define Build/Compile 
    36         $(call Build/Compile/Default, \ 
    37                 COPTS="$(TARGET_CFLAGS)" \ 
    38                 DESTDIR="$(PKG_INSTALL_DIR)" \ 
    39                 INSTALL="install" \ 
    40                 all install \ 
    41         ) 
     34MAKE_FLAGS += \ 
     35        COPTS="$(TARGET_CFLAGS)" \ 
     36        INSTALL="install" \ 
     37 
     38define Package/pptpd/conffiles 
     39/etc/pptpd.conf 
     40/etc/ppp/options.pptpd 
    4241endef 
    4342 
    4443define Package/pptpd/install 
    4544        $(INSTALL_DIR) $(1)/usr/sbin 
    46         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(1)/usr/sbin/ 
    47         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(1)/usr/sbin/ 
     45        $(CP) \ 
     46                $(PKG_INSTALL_DIR)/usr/sbin/bcrelay \ 
     47                $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl \ 
     48                $(PKG_INSTALL_DIR)/usr/sbin/pptpd \ 
     49                $(1)/usr/sbin/ 
    4850        $(INSTALL_DIR) $(1)/usr/lib/pptpd 
    49         $(CP) $(PKG_INSTALL_DIR)/usr/lib/pptpd/* $(1)/usr/lib/pptpd 
     51        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pptpd/* $(1)/usr/lib/pptpd/ 
    5052        $(INSTALL_DIR) $(1)/etc 
    5153        $(INSTALL_DATA) ./files/pptpd.conf $(1)/etc/ 
Note: See TracChangeset for help on using the changeset viewer.