From 7b0ad787d6fb0e967e4ee938fffaf804cf433588 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 19 Sep 2007 20:13:08 +0000 Subject: - fixes and cleanups (Cristian Ionescu-Idbohrn) --- package/lighttpd/lighttpd.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'package/lighttpd') diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index cafb3d285..afb57cb7d 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -14,11 +14,13 @@ LIGHTTPD_TARGET_BINARY:=usr/sbin/lighttpd $(DL_DIR)/$(LIGHTTPD_SOURCE): $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_SOURCE) + ifneq ($(LIGHTTPD_PATCH),) LIGHTTPD_PATCH_FILE:=$(DL_DIR)/$(LIGHTTPD_PATCH) $(LIGHTTPD_PATCH_FILE): $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_PATCH) endif + lighttpd-source: $(DL_DIR)/$(LIGHTTPD_SOURCE) $(LIGHTTPD_PATCH_FILE) $(LIGHTTPD_DIR)/.unpacked: $(DL_DIR)/$(LIGHTTPD_SOURCE) @@ -63,17 +65,21 @@ $(LIGHTTPD_DIR)/.configured: $(LIGHTTPD_DIR)/.unpacked $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY): $(LIGHTTPD_DIR)/.configured $(MAKE) -C $(LIGHTTPD_DIR) - + $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY): $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIGHTTPD_DIR) install - @rm -rf $(TARGET_DIR)/usr/share/man $(TARGET_DIR)/usr/man +ifneq ($(BR2_HAVE_MANPAGES),y) + rm -rf $(TARGET_DIR)/usr/share/man +endif @rm -rf $(TARGET_DIR)/usr/lib/lighttpd/*.la $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/lighttpd/*.so $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY) @if [ ! -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ]; then \ - $(INSTALL) -m 0644 -D $(LIGHTTPD_DIR)/doc/lighttpd.conf $(TARGET_DIR)/etc/lighttpd/lighttpd.conf; \ + $(INSTALL) -m 0644 -D $(LIGHTTPD_DIR)/doc/lighttpd.conf \ + $(TARGET_DIR)/etc/lighttpd/lighttpd.conf; \ fi - $(INSTALL) -m 0755 -D package/lighttpd/rc.lighttpd $(TARGET_DIR)/etc/init.d/S99lighttpd + $(INSTALL) -m 0755 -D package/lighttpd/rc.lighttpd \ + $(TARGET_DIR)/etc/init.d/S99lighttpd ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y) lighttpd: uclibc openssl $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY) -- cgit v1.2.3