summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2018-12-16 10:31:02 -0800
committerRosen Penev <rosenp@gmail.com>2020-01-23 23:14:17 -0800
commitd39f4b806fea35bfad4016c2cc2ce2ff53eb32e6 (patch)
tree51649774862c9482a7e85ad9d0b6ee7cb3720901
parent4b2bdd01998aafd9eea660b8aab8615424106cdb (diff)
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 <rosenp@gmail.com> (cherry-picked from bf42426e4a97f3e771de2d3063a4d38f7c8f40e8 5fbc6c873e29dcde6d048ffbbea252411816f884 027ed92f6ed4adb1a90d36c2d3429106b326a53b)
-rw-r--r--utils/gammu/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/gammu/Makefile b/utils/gammu/Makefile
index f2ab0fc9c..023067421 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