Changeset 28789


Ignore:
Timestamp:
2011-11-06T21:52:41+01:00 (6 years ago)
Author:
nico
Message:

[backfire] packages/privoxy: merge r28778 & r28779

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.1/net/privoxy/Makefile

    r26389 r28789  
    11# 
    2 # Copyright (C) 2006-2009 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=privoxy 
    1111PKG_VERSION:=3.0.17 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz 
     
    1717 
    1818PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable 
     19PKG_FIXUP:=autoreconf 
     20PKG_INSTALL:=1 
    1921 
    2022include $(INCLUDE_DIR)/package.mk 
     
    2426  CATEGORY:=Network 
    2527  SUBMENU:=Web Servers/Proxies 
    26   DEPENDS:=+libpcre +libpthread 
     28  DEPENDS:=+libpcre +libpthread +zlib 
    2729  TITLE:=web proxy with advanced filtering capabilities 
    2830  URL:=http://www.privoxy.org/ 
     
    3840endef 
    3941 
    40 define Build/Configure 
    41         (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ 
    42                 autoheader && autoconf \ 
    43         ); 
    44         $(call Build/Configure/Default, \ 
    45                 --sysconfdir=/etc/privoxy \ 
    46         ) 
    47 endef 
     42CONFIGURE_ARGS += \ 
     43        --sysconfdir=/etc/privoxy \ 
    4844 
    49 define Build/Compile 
    50         $(MAKE) -C $(PKG_BUILD_DIR) \ 
    51                 SPECIAL_CFLAGS="-pthread $(TARGET_LDFLAGS)" 
    52         $(MAKE) -C $(PKG_BUILD_DIR) \ 
    53                 DESTDIR="$(PKG_INSTALL_DIR)" \ 
    54                 install 
    55 endef 
     45MAKE_FLAGS := 
    5646 
    5747define Package/privoxy/conffiles 
     
    6151define Package/privoxy/install 
    6252        $(INSTALL_DIR) $(1)/usr/sbin 
    63         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/privoxy $(1)/usr/sbin/ 
     53        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/privoxy $(1)/usr/sbin/ 
    6454        $(INSTALL_DIR) $(1)/etc/privoxy 
    6555        $(CP) $(PKG_INSTALL_DIR)/etc/privoxy/* $(1)/etc/privoxy/ 
Note: See TracChangeset for help on using the changeset viewer.