summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-27 21:58:04 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-27 21:58:04 +0000
commitef1462171a1bc1942a4d322476a8ecdf152b0750 (patch)
tree0cc0eae62d19639edc2102fd3896b1b9ccce2cf4 /package
parent7981a7884597690ad3da16e012a6e3203675a629 (diff)
fix syslog-ng, remove libol dependency in ipkg/control since statically
linked, change startup prio to a more reasonable value, standardize. git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3513 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/syslog-ng/Makefile65
-rw-r--r--package/syslog-ng/ipkg/syslog-ng.control1
2 files changed, 31 insertions, 35 deletions
diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile
index 081d12024a..72045ae06d 100644
--- a/package/syslog-ng/Makefile
+++ b/package/syslog-ng/Makefile
@@ -14,42 +14,42 @@ PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_INIT_LEVEL:=00
+PKG_INIT_LEVEL:=60
include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,SYSLOG_NG,syslog-ng,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libol" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libol" \
./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) \
- --localstatedir=/var/lib \
- --disable-dependency-tracking \
- --disable-full-static \
- --enable-tcp-wrapper \
- --with-libol=$(STAGING_DIR)/usr/bin \
+ --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) \
+ --disable-dependency-tracking \
+ --disable-full-static \
+ --enable-tcp-wrapper \
+ --with-libol="$(STAGING_DIR)/usr/bin" \
);
touch $(PKG_BUILD_DIR)/.configured
@@ -58,19 +58,16 @@ $(PKG_BUILD_DIR)/.built:
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
- CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libol" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libol" \
- CC=$(TARGET_CC) \
- install-exec install-data
+ all install
touch $@
$(IPKG_SYSLOG_NG):
install -d -m0755 $(IDIR_SYSLOG_NG)/usr/sbin
- install -d -m0755 $(IDIR_SYSLOG_NG)/etc/syslog-ng
+ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(IDIR_SYSLOG_NG)/usr/sbin/
install -d -m0755 $(IDIR_SYSLOG_NG)/etc/init.d
- $(CP) ${PKG_BUILD_DIR}/src/syslog-ng $(IDIR_SYSLOG_NG)/usr/sbin/
- $(CP) files/syslog-ng.conf $(IDIR_SYSLOG_NG)/etc/syslog-ng/
- $(CP) files/syslog-ng.init $(IDIR_SYSLOG_NG)/etc/init.d/S$(PKG_INIT_LEVEL)syslog-ng
+ install -m0755 ./files/syslog-ng.init $(IDIR_SYSLOG_NG)/etc/init.d/S$(PKG_INIT_LEVEL)syslog-ng
+ install -d -m0755 $(IDIR_SYSLOG_NG)/etc/syslog-ng
+ install -m0644 ./files/syslog-ng.conf $(IDIR_SYSLOG_NG)/etc/syslog-ng/
$(RSTRIP) $(IDIR_SYSLOG_NG)
$(IPKG_BUILD) $(IDIR_SYSLOG_NG) $(PACKAGE_DIR)
diff --git a/package/syslog-ng/ipkg/syslog-ng.control b/package/syslog-ng/ipkg/syslog-ng.control
index ead047b3cb..074fff1898 100644
--- a/package/syslog-ng/ipkg/syslog-ng.control
+++ b/package/syslog-ng/ipkg/syslog-ng.control
@@ -2,4 +2,3 @@ Package: syslog-ng
Priority: optional
Section: admin
Description: A powerful syslog daemon
-Depends: libol