deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

civetweb: use TARGET_CONFIGURE_OPTS

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

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2015-04-27 22:31:00 +02:00
parent efd49e3366
commit ea94747798
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/civetweb/civetweb.mk
View file

@ -10,7 +10,7 @@ CIVETWEB_LICENSE = MIT
CIVETWEB_LICENSE_FILES = LICENSE.md CIVETWEB_LICENSE_FILES = LICENSE.md
CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 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_LIBS = -lpthread -lm
CIVETWEB_SYSCONFDIR = /etc CIVETWEB_SYSCONFDIR = /etc
CIVETWEB_HTMLDIR = /var/www CIVETWEB_HTMLDIR = /var/www
@ -29,13 +29,13 @@ CIVETWEB_COPT += -DNO_SSL
endif endif
define CIVETWEB_BUILD_CMDS define CIVETWEB_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) build \ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) build \
$(CIVETWEB_CONF_OPTS) \ $(CIVETWEB_CONF_OPTS) \
COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)" COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)"
endef endef
define CIVETWEB_INSTALL_TARGET_CMDS define CIVETWEB_INSTALL_TARGET_CMDS
$(MAKE) CC="$(TARGET_CC)" -C $(@D) install \ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \
DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \ DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \
CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \ CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \
HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \ HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \