aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-05-29 22:49:15 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-05-29 22:49:15 +0200
commitb35df346a61c1b4d8835679dc5416734dfc07419 (patch)
treebccd6b56fda80c59746a5e0a5ee5d352f2b84a2c
parentb4cda668d8a1cf1085581e16b1a6c2622ebb5578 (diff)
downloadbuildroot-b35df346a61c1b4d8835679dc5416734dfc07419.tar.gz
buildroot-b35df346a61c1b4d8835679dc5416734dfc07419.tar.bz2
package/hiawatha: reorder CONF_OPTS in the .mk file
Move the unconditional CONF_OPTS assignment toward the beginning of the file, before the conditionals on optional dependencies. And use = for this unconditional assignment instead of +=. No functional changes, just to align with the coding style used in most other packages. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/hiawatha/hiawatha.mk16
1 files changed, 8 insertions, 8 deletions
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 28fd286ea8..01b9292035 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -10,6 +10,14 @@ HIAWATHA_DEPENDENCIES = zlib
HIAWATHA_LICENSE = GPL-2.0
HIAWATHA_LICENSE_FILES = LICENSE
+HIAWATHA_CONF_OPTS = \
+ -DENABLE_TOOLKIT=OFF \
+ -DCONFIG_DIR=/etc/hiawatha \
+ -DLOG_DIR=/var/log \
+ -DPID_DIR=/var/run \
+ -DWEBROOT_DIR=/var/www/hiawatha \
+ -DWORK_DIR=/var/lib/hiawatha
+
ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON
HIAWATHA_DEPENDENCIES += mbedtls
@@ -24,12 +32,4 @@ else
HIAWATHA_CONF_OPTS += -DENABLE_XSLT=OFF
endif
-HIAWATHA_CONF_OPTS += \
- -DENABLE_TOOLKIT=OFF \
- -DCONFIG_DIR=/etc/hiawatha \
- -DLOG_DIR=/var/log \
- -DPID_DIR=/var/run \
- -DWEBROOT_DIR=/var/www/hiawatha \
- -DWORK_DIR=/var/lib/hiawatha
-
$(eval $(cmake-package))