From 91617ea1901347a48f0f109aa7a5853d6dd2810d Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Wed, 8 Sep 2021 11:45:01 +0000 Subject: [PATCH] mk: Only apply --localstatedir when >= DSM-7.0 --- mk/spksrc.configure.mk | 2 ++ mk/spksrc.cross-cmake-env.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mk/spksrc.configure.mk b/mk/spksrc.configure.mk index 8e3e72ad051b..b9ecac9b6323 100644 --- a/mk/spksrc.configure.mk +++ b/mk/spksrc.configure.mk @@ -39,8 +39,10 @@ ifneq ($(strip $(GNU_CONFIGURE)),) REAL_CONFIGURE_ARGS += $(TC_CONFIGURE_ARGS) REAL_CONFIGURE_ARGS += --prefix=$(INSTALL_PREFIX) # DSM7 appdir +ifeq ($(call version_ge, ${TCVERSION}, 7.0),1) REAL_CONFIGURE_ARGS += --localstatedir=$(INSTALL_PREFIX_VAR) endif +endif REAL_CONFIGURE_ARGS += $(CONFIGURE_ARGS) configure_msg: diff --git a/mk/spksrc.cross-cmake-env.mk b/mk/spksrc.cross-cmake-env.mk index bd806b7fd794..b82901775b1b 100644 --- a/mk/spksrc.cross-cmake-env.mk +++ b/mk/spksrc.cross-cmake-env.mk @@ -14,7 +14,9 @@ CMAKE_ARGS += -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE CMAKE_ARGS += -DBUILD_SHARED_LIBS=ON # DSM7 appdir +ifeq ($(call version_ge, ${TCVERSION}, 7.0),1) CMAKE_ARGS += -DCMAKE_INSTALL_LOCALSTATEDIR=$(INSTALL_PREFIX_VAR) +endif # Use native cmake ifeq ($(strip $(USE_NATIVE_CMAKE)),1)