Commit ea947477 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

civetweb: use TARGET_CONFIGURE_OPTS 



Instead of explicitly handling CC/LD/CFLAGS. No functional change, but it is
cleaner like this.

Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent efd49e33

package/civetweb/civetweb.mk

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ CIVETWEB_LICENSE = MIT 
CIVETWEB_LICENSE_FILES = LICENSE.md



CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1

CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0

CIVETWEB_COPT = -DHAVE_POSIX_FALLOCATE=0

CIVETWEB_LIBS = -lpthread -lm

CIVETWEB_SYSCONFDIR = /etc

CIVETWEB_HTMLDIR = /var/www
@@ -29,13 +29,13 @@ CIVETWEB_COPT += -DNO_SSL 
endif



define CIVETWEB_BUILD_CMDS

	$(MAKE) CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) build \

	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) build \

		$(CIVETWEB_CONF_OPTS) \

		COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)"

endef



define CIVETWEB_INSTALL_TARGET_CMDS

	$(MAKE) CC="$(TARGET_CC)" -C $(@D) install \

	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \

		DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \

		CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \

		HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \