From patchwork Wed Mar 27 11:42:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 10873253 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7963A1575 for ; Wed, 27 Mar 2019 11:43:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6176A28C99 for ; Wed, 27 Mar 2019 11:43:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55C9528C9D; Wed, 27 Mar 2019 11:43:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6140628C99 for ; Wed, 27 Mar 2019 11:43:06 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id C9B7485F; Wed, 27 Mar 2019 12:42:13 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C9B7485F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1553686983; bh=fIBdY+8U9cI99K/MKHaN2u+VxdHoUx09tZOMZkKJ6eI=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=OBw5mkEyax+6ZY82seDEyeW0iQxtONeP576qPqxsW9V/O125EvMP/dQ0DLZUc5cve u4EvVakIuGeeYB3jztXbVW6Zv3W3VN4rWGHHWIqkg6hYAOKHiuDNDlvE7fJgU4tdwT uQZhALY8iRCmAHX7y4HaDXf/XNxmmHw7R28fw9yw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2BD88F80C17; Wed, 27 Mar 2019 12:42:13 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id A95D2F80CAB; Wed, 27 Mar 2019 12:42:10 +0100 (CET) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id B9A6FF8071D for ; Wed, 27 Mar 2019 12:42:07 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B9A6FF8071D X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 91EA1AEF5 for ; Wed, 27 Mar 2019 11:42:06 +0000 (UTC) From: Takashi Iwai To: alsa-devel@alsa-project.org Date: Wed, 27 Mar 2019 12:42:04 +0100 Message-Id: <20190327114204.26304-1-tiwai@suse.de> X-Mailer: git-send-email 2.16.4 Subject: [alsa-devel] [PATCH alsa-plugins] configure: Fix unexpanded ALSA_DATA_DIR X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP When no --with-alsadatadir is given, configure scripts takes $datadir/alsa as the default location, while it's expanded to $prefix/data/alsa. Although ALSA_DATA_DIR is set via AC_DEFINE_UNQUOTED(), this expands only $alsadatadir itself and not about the $prefix in the content. For resolving this, we need to do eval twice. Signed-off-by: Takashi Iwai Acked-by: Jaroslav Kysela --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1be4a70c803c..5b131e704c2f 100644 --- a/configure.ac +++ b/configure.ac @@ -211,7 +211,7 @@ if test -z "$alsadatadir"; then eval dir="$datadir" case "$dir" in /*) ;; - *) dir="$dir" + *) eval dir="$dir" esac alsadatadir="$dir/alsa" fi