umurmur: fix paths
authorSebastian Kemper <sebastian_ml@gmx.net>
Tue, 29 Oct 2019 19:54:19 +0000 (20:54 +0100)
committerSebastian Kemper <sebastian_ml@gmx.net>
Tue, 29 Oct 2019 19:54:22 +0000 (20:54 +0100)
The wrong paths slipped into the Makefile when converting to CMake. This
commit corrects them.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
net/umurmur/Makefile

index 29c8a0d8c9562d67ae7e9f64adc7ccb00a987b04..6f0180f558928c1ba30d384be6af5ab4e5df4c28 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umurmur
 PKG_VERSION:=0.2.17
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/umurmur/umurmur/tar.gz/$(PKG_VERSION)?
@@ -77,20 +77,20 @@ endef
 Package/umurmur-mbedtls/install = $(Package/umurmur-openssl/install)
 
 CMAKE_OPTIONS += \
-       -DLIBCONFIG_INCLUDE_DIR="$(STAGING_DIR)/include" \
-       -DLIBCONFIG_LIBRARIES="$(STAGING_DIR)/lib" \
-       -DLIBCONFIG_LIB_DIR="$(STAGING_DIR)/lib" \
-       -DPROTOBUFC_INCLUDE_DIR="$(STAGING_DIR)/include" \
-       -DPROTOBUFC_LIBRARIES="$(STAGING_DIR)/lib" \
-       -DPROTOBUFC_LIB_DIR="$(STAGING_DIR)/lib"
+       -DLIBCONFIG_INCLUDE_DIR="$(STAGING_DIR)/usr/include" \
+       -DLIBCONFIG_LIBRARIES="$(STAGING_DIR)/usr/lib" \
+       -DLIBCONFIG_LIB_DIR="$(STAGING_DIR)/usr/lib" \
+       -DPROTOBUFC_INCLUDE_DIR="$(STAGING_DIR)/usr/include" \
+       -DPROTOBUFC_LIBRARIES="$(STAGING_DIR)/usr/lib" \
+       -DPROTOBUFC_LIB_DIR="$(STAGING_DIR)/usr/lib"
 
 ifeq ($(BUILD_VARIANT),openssl)
 CMAKE_OPTIONS += -DSSL=openssl
 else
 CMAKE_OPTIONS += -DSSL=mbedtls \
-       -DMBEDTLS_INCLUDE_DIR="$(STAGING_DIR)/include/mbedtls" \
-       -DMBEDTLS_LIBRARIES="$(STAGING_DIR)/lib" \
-       -DMBEDTLS_LIB_DIR="$(STAGING_DIR)/lib"
+       -DMBEDTLS_INCLUDE_DIR="$(STAGING_DIR)/usr/include/mbedtls" \
+       -DMBEDTLS_LIBRARIES="$(STAGING_DIR)/usr/lib" \
+       -DMBEDTLS_LIB_DIR="$(STAGING_DIR)/usr/lib"
 endif
 
 $(eval $(call BuildPackage,umurmur-openssl))