From d39f4b806fea35bfad4016c2cc2ce2ff53eb32e6 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 16 Dec 2018 10:31:02 -0800 Subject: [PATCH] 11# This is a combination of 2 commits. gammu: Fix build under 64-bit targets. There's a faulty suffix variable that points to the wrong place. Signed-off-by: Rosen Penev (cherry-picked from bf42426e4a97f3e771de2d3063a4d38f7c8f40e8 5fbc6c873e29dcde6d048ffbbea252411816f884 027ed92f6ed4adb1a90d36c2d3429106b326a53b) --- utils/gammu/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/gammu/Makefile b/utils/gammu/Makefile index f2ab0fc9cb..0230674212 100644 --- a/utils/gammu/Makefile +++ b/utils/gammu/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gammu PKG_VERSION:=1.37.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://dl.cihar.com/gammu/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -50,7 +50,7 @@ define Build/InstallDev mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/gammu $(1)/usr/include/ mkdir -p $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/lib{Gammu*,gsmsd*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{Gammu*,gsmsd*} $(1)/usr/lib/ endef define Package/gammu/install @@ -58,7 +58,7 @@ define Package/gammu/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gammu $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gammu-{smsd,smsd-inject,smsd-monitor} $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/lib{Gammu*,gsmsd*} $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{Gammu*,gsmsd*} $(1)/usr/lib $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) ./files/gammu $(1)/etc/config/gammu