summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-16 19:25:29 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-16 19:25:29 +0000
commitc04a3db922dc6e28fa111f5124bd07e6e1093d28 (patch)
treeec58d0fac02b044956ea00112df51404635be265
parenta5cf9ff057db54f2273a62779681ed0edee5a0c1 (diff)
standardize, don't install everything - just the binary,
add Id tag to the Makefile. git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2708 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--[-rwxr-xr-x]package/wccpd/Config.in0
-rw-r--r--[-rwxr-xr-x]package/wccpd/Makefile60
-rw-r--r--[-rwxr-xr-x]package/wccpd/ipkg/wccpd.control5
3 files changed, 39 insertions, 26 deletions
diff --git a/package/wccpd/Config.in b/package/wccpd/Config.in
index ed219ed5f..ed219ed5f 100755..100644
--- a/package/wccpd/Config.in
+++ b/package/wccpd/Config.in
diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile
index 318a074df..044b839ad 100755..100644
--- a/package/wccpd/Makefile
+++ b/package/wccpd/Makefile
@@ -1,14 +1,17 @@
+# $Id$
+
include $(TOPDIR)/rules.mk
PKG_NAME:=wccpd
PKG_VERSION:=0.2
PKG_RELEASE:=1
PKG_MD5SUM:=5f15c274de61dfb88e0dbfc1ccbe6b67
+
PKG_SOURCE_URL:=@SF/wccpd
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_CAT:=zcat
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(TOPDIR)/package/rules.mk
@@ -17,35 +20,46 @@ $(eval $(call PKG_template,WCCPD,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARC
$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAAGING_DIR)/lib" \
ac_cv_func_setpgrp_void=yes \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --program-prefix="" \
- --with-gnu-ld \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --program-prefix="" \
+ --program-suffix="" \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --datadir=/usr/share \
+ --includedir=/usr/include \
+ --infodir=/usr/share/info \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --mandir=/usr/share/man \
+ --sbindir=/usr/sbin \
+ --sysconfdir=/etc \
+ $(DISABLE_LARGEFILE) \
+ $(DISABLE_NLS) \
+ --enable-shared \
+ --enable-static \
+ --disable-rpath \
+ --with-gnu-ld \
);
touch $@
$(PKG_BUILD_DIR)/.built:
- $(MAKE) DESTDIR=$(PKG_INSTALL_DIR) -C $(PKG_BUILD_DIR) install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR=$(PKG_INSTALL_DIR) \
+ all install
touch $@
$(IPKG_WCCPD):
- mkdir -p $(IDIR_WCCPD)
- cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_WCCPD)/
+ install -d -m0755 $(IDIR_WCCPD)/usr/sbin
+ cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/wccpd $(IDIR_WCCPD)/usr/sbin/
$(RSTRIP) $(IDIR_WCCPD)
$(IPKG_BUILD) $(IDIR_WCCPD) $(PACKAGE_DIR)
diff --git a/package/wccpd/ipkg/wccpd.control b/package/wccpd/ipkg/wccpd.control
index 136051d6b..e62539a7d 100755..100644
--- a/package/wccpd/ipkg/wccpd.control
+++ b/package/wccpd/ipkg/wccpd.control
@@ -1,5 +1,4 @@
Package: wccpd
-Section: net
-Architecture: mipsel
Priority: optional
-Description: wccpd is a WCCP (Web Cache Coordination Protocol) server daemon.
+Section: net
+Description: A WCCP (Web Cache Coordination Protocol) server daemon