summaryrefslogtreecommitdiff
path: root/package/civetweb
diff options
context:
space:
mode:
authorThomas De Schampheleire <patrickdepinguin@gmail.com>2014-09-27 21:32:44 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-04 18:54:16 +0200
commitaaffd209fae91a733fe0becb72268f87bf4ea369 (patch)
tree40569895ef8a09c605060e2164d86567a12f9889 /package/civetweb
parent1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/civetweb')
-rw-r--r--package/civetweb/civetweb.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
index 4b73a5edb..9d5eecd80 100644
--- a/package/civetweb/civetweb.mk
+++ b/package/civetweb/civetweb.mk
@@ -9,7 +9,7 @@ CIVETWEB_SITE = $(call github,sunsetbrew,civetweb,$(CIVETWEB_VERSION))
CIVETWEB_LICENSE = MIT
CIVETWEB_LICENSE_FILES = LICENSE.md
-CIVETWEB_CONF_OPT = TARGET_OS=LINUX
+CIVETWEB_CONF_OPTS = TARGET_OS=LINUX
CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0
CIVETWEB_LIBS = -lpthread -lm -ldl
CIVETWEB_SYSCONFDIR = /etc
@@ -20,11 +20,11 @@ ifneq ($(BR2_LARGEFILE),y)
endif
ifeq ($(BR2_INET_IPV6),y)
- CIVETWEB_CONF_OPT += WITH_IPV6=1
+ CIVETWEB_CONF_OPTS += WITH_IPV6=1
endif
ifeq ($(BR2_CIVETWEB_WITH_LUA),y)
- CIVETWEB_CONF_OPT += WITH_LUA=1
+ CIVETWEB_CONF_OPTS += WITH_LUA=1
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
@@ -37,7 +37,7 @@ endif
define CIVETWEB_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) build \
- $(CIVETWEB_CONF_OPT) \
+ $(CIVETWEB_CONF_OPTS) \
COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)"
endef
@@ -48,7 +48,7 @@ define CIVETWEB_INSTALL_TARGET_CMDS
HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)" \
PREFIX="$(TARGET_DIR)/usr" \
- $(CIVETWEB_CONF_OPT) \
+ $(CIVETWEB_CONF_OPTS) \
COPT='$(CIVETWEB_COPT)'
endef