From patchwork Tue Jan 14 09:57:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1222627 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::338; helo=mail-wm1-x338.google.com; envelope-from=swupdate+bncbcxploxj6ikrb6fb63yakgqefgqv25a@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=K4JoY5uo; dkim-atps=neutral Received: from mail-wm1-x338.google.com (mail-wm1-x338.google.com [IPv6:2a00:1450:4864:20::338]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47xmC23knBz9sP6 for ; Tue, 14 Jan 2020 20:59:24 +1100 (AEDT) Received: by mail-wm1-x338.google.com with SMTP id t4sf3348926wmf.2 for ; Tue, 14 Jan 2020 01:59:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1578995960; cv=pass; d=google.com; s=arc-20160816; b=h4fXnnLwWfDYRPhV4K8XdFK/YT0GRLsqiyKxURs5xI/rNenHz8DZ9cj5001z2vLtm+ NbkdsraxSNr0YUyqCiK6NACSmamJRHu+fBStlSXqTANsf5z3gRV7UC7ipEohwBdG0O95 uj+gI3Bzg6Dkl5kfbj6+MdhNso04r72Bi7l9k5B1zMdBIGLEzUUx4uqtri/hkiKnuH35 jLRQ+8Lb6C2vQXTvbdgPCm1Nz0WUYtRIqGlP8GaohfyADXpfUVCllMUnZJtaC13NUNUE kvZNLWvtrNnFq4hEaoNwTUwFOrMqRmuRT0i4ftkKDijJB6mL0S6pz5oZVUdnwiZfWrDO Wqyw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:message-id:date:subject:cc:to:from :mime-version:sender:dkim-signature; bh=/9kTpCGAoRwDXnFvPD1hrsQp1Tmim51ZkU1+MHUpbq8=; b=c8evaEV+EIKgPo3NoOnkV7caOFoYu6HVMCk8IKDBnZu7gATPtrAPiB1QRT9Ss7nejx d6+GyY2dBY47LrZ3fnonjIzTOQMgvblf1gWCG/+gG++njwpzpwc/heANJeprfl/cdLB2 HwFlpZoypIfYAK6iT54p2TtDzKBJ3jJO3GKs6NWQze1uIKywlu7YDkRx6GIMAO9W5mL7 OYRpcsTNOZMO4TjYjL4ph4U2ZkgwoODZB6RxJhXWIfQMSVt5Ium3xZ86lv9Yfya5V71T /9H+DhcbgaRrG2h7ZAO+yJ6f6XOHt7blsAxhZEUcOXUw2uUGZqWb8Vx1nCFYjqiZoZTS 84JA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=/9kTpCGAoRwDXnFvPD1hrsQp1Tmim51ZkU1+MHUpbq8=; b=K4JoY5uoyJN65z1W+AXnL0OU6hT2yNCMV6Fxu1qe2E1L3t/RjOpmehGTrNAlcAmVCL DU7sx1dNllcpmSHthutae5vRVbftxIrypkIdiL+Nk9sxhZchJNYdCCbWang/I+o3dpRZ A3SQR3zZpFjknEn61uQXA13i5Z2/6KMd/2snf9CbEivlTkzQYz+mDWXobqKOhmtSbi8I yucr6W+XFWvPISFcHxBM/TeFwATN3enyDxVHPfF7OwhLlXtjaMRXy0/WAFkJuXgctdB6 eiviMMvaFYT+oFV8jZZvYBt9A6ZYuxbCEl8YkHY/OPeP2clnJreQ0f4lp2QvbS+tSw0/ cnXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=/9kTpCGAoRwDXnFvPD1hrsQp1Tmim51ZkU1+MHUpbq8=; b=fatONLpDXcKs9kmAeMMmv2L4teEi2MXXz2IDNWdE06fMG+anNg698xLG3NcpR6/ghJ hOIJwJk/wb/bgfg0CbpVm+WqgMH8jc4KFGQfZifzVJcP8SwC5icZw/XIFvlxtTYx2y7W A3yNvUHkqE6SbSvmMH2e57K/RundIFEtuL6tRMdwZ6kDk/QOWevYzQ8INo6jSPSmwKEO bCxfrRLqDCyBcJHHVrAET/o9ZmecQGqtuxgYkc/nR90YX3XxQVqYMArDwQxf5tMuPCQA ctdoIF2Q4LRwHM6SPfgMiP68zLry+2s0m4unHx/MP3gzXV/VI+6T4ts6Or2Y7ul6cX3v n4Mw== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAUpAcGRNb2cIm4XXbGCjNwDC2WZRNOuKwLpg8x5g7SQHLjRjcwa HuK8MJtmQfCSpgQZz2FAn2I= X-Google-Smtp-Source: APXvYqxdsgrp8+/G2EiLMlHj6U9NNDdFm0pnQrhAauhz67vqVDUUb8cw89XtVeCu55/zXMVgdwZ0Hg== X-Received: by 2002:a1c:dcd5:: with SMTP id t204mr27015429wmg.34.1578995960502; Tue, 14 Jan 2020 01:59:20 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a7b:c452:: with SMTP id l18ls7335324wmi.1.canary-gmail; Tue, 14 Jan 2020 01:59:19 -0800 (PST) X-Received: by 2002:a7b:cb0d:: with SMTP id u13mr27023320wmj.31.1578995959930; Tue, 14 Jan 2020 01:59:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578995959; cv=none; d=google.com; s=arc-20160816; b=Wmpug4ogJ0WADi7HmN40J/49XyZPTDVe0ZljGFjEmFxJzG2pLtex6JZzTI4vFpvGS5 Pcc78yc6B9fLgbPbKFD/4pAmsfrkHh3LZ6G2qDq0gCGem8yg99Rk9a0WnlIq0wmBW5px Wmjhm+cugtRQYvWPAOFBri8kwZnSpu7gC6utIkRgGCvlAH29cczmEBzoGzOH8VqHcb9P XQ72xUrwBwRqFy2YRTvEMc+cU2UFvH+dP5/XTyoHseoYOxrr3HNMYaG7Uy+YNnyfKcZK t/RxppEII/06TrUAwEaTIQG6QJ1SsmCp4osLbIVfqChXOfOQWlJJHdiF/Rmm1/QtTbh0 kbDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from; bh=pu99TNWsoleITt3Pv16rxpO/AoX+CFlkHpdr+wtiF84=; b=Q3iSaE/66Hrh72MFUwo5CHV4rYiRDLlEhLX1K2KEuqRip2iKQV6Fu/VAMfvPIvueMx jNa8jr4zTLu7pXu3esWq8R3Xdt3njgvkrGGtmsuIjFzjlWXO8seyDzgrMvb4jaYMIU1Z W9MxTYW2uP1iwdXo1Tlh5IyvlP4ws3jRGXzjJqmek3HuM0UGVEBrBBkHrNkP9/Y607uF zpmXIg4VO/kl/7KD6qbgbxvW8UNF04nwskAV13OYjeoJ2BI8dbu4jug7Rwzea/RgMGgK QCzmb2n5VH9+LCXjJAKrWCpNOE1Gp+RUGtrhMP8/xj429Q3R3strNEmepKLNsgbb81mR RDVQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [2001:a60:0:28:0:1:25:1]) by gmr-mx.google.com with ESMTPS id b9si680870wrw.2.2020.01.14.01.59.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jan 2020 01:59:19 -0800 (PST) Received-SPF: neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=2001:a60:0:28:0:1:25:1; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47xmBv5H6bz1rrjq; Tue, 14 Jan 2020 10:59:19 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47xmBv54K6z1qql3; Tue, 14 Jan 2020 10:59:19 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id Sswm6MfcENso; Tue, 14 Jan 2020 10:59:15 +0100 (CET) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Tue, 14 Jan 2020 10:59:15 +0100 (CET) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id A93A44540494; Tue, 14 Jan 2020 10:59:15 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kxqRW1qMSRtV; Tue, 14 Jan 2020 10:59:12 +0100 (CET) Received: from localhost.localdomain (papero.fritz.box [192.168.178.132]) by babic.homelinux.org (Postfix) with ESMTP id BE88C45401B4; Tue, 14 Jan 2020 10:59:12 +0100 (CET) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [libubootenv][PATCH] Use CMAKE_INSTALL_LIBDIR instead hardcoded lib/ Date: Tue, 14 Jan 2020 10:57:09 +0100 Message-Id: <20200114095709.2122-1-sbabic@denx.de> X-Mailer: git-send-email 2.17.1 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Signed-off-by: Stefano Babic --- src/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ad05ecc..cc3ea83 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,6 +10,8 @@ SET(include_HEADERS libuboot.h ) +include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable + add_library(ubootenv SHARED ${libubootenv_SOURCES} ${include_HEADERS}) SET_TARGET_PROPERTIES(ubootenv PROPERTIES SOVERSION ${SOVERSION}) @@ -19,7 +21,7 @@ add_executable(fw_setenv fw_setenv.c) target_link_libraries(fw_printenv ubootenv z) target_link_libraries(fw_setenv ubootenv z) -install (TARGETS ubootenv DESTINATION lib) +install (TARGETS ubootenv DESTINATION ${CMAKE_INSTALL_LIBDIR}) install (FILES libuboot.h DESTINATION include) install (TARGETS fw_printenv DESTINATION bin) install (TARGETS fw_setenv DESTINATION bin) @@ -28,10 +30,10 @@ install (TARGETS fw_setenv DESTINATION bin) set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) set(includedir ${CMAKE_INSTALL_PREFIX}/include) -set(libdir ${CMAKE_INSTALL_PREFIX}/lib) +set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) configure_file(${CMAKE_SOURCE_DIR}/src/libubootenv.pc.in ${CMAKE_BINARY_DIR}/libubootenv.pc @ONLY) set(LIBUBOOTENV_PKG_CONFIG_FILES ${CMAKE_BINARY_DIR}/libubootenv.pc) message(STATUS "Generate ${LIBUBOOTENV_PKG_CONFIG_FILES}") # Install pkg-config files -install(FILES ${LIBUBOOTENV_PKG_CONFIG_FILES} DESTINATION lib/pkgconfig) +install(FILES ${LIBUBOOTENV_PKG_CONFIG_FILES} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)