From owner-freebsd-bugs@FreeBSD.ORG Sat May 22 09:10:02 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22E661065670 for ; Sat, 22 May 2010 09:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D9B718FC1A for ; Sat, 22 May 2010 09:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o4M9A1nK070981 for ; Sat, 22 May 2010 09:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o4M9A1xT070980; Sat, 22 May 2010 09:10:01 GMT (envelope-from gnats) Resent-Date: Sat, 22 May 2010 09:10:01 GMT Resent-Message-Id: <201005220910.o4M9A1xT070980@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Anonymous Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8AA9106564A for ; Sat, 22 May 2010 09:03:36 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3B64C8FC26 for ; Sat, 22 May 2010 09:03:35 +0000 (UTC) Received: by fxm4 with SMTP id 4so1875864fxm.13 for ; Sat, 22 May 2010 02:03:35 -0700 (PDT) Received: by 10.223.24.85 with SMTP id u21mr2470359fab.8.1274519015046; Sat, 22 May 2010 02:03:35 -0700 (PDT) Received: from localhost (95-25-188-72.broadband.corbina.ru [95.25.188.72]) by mx.google.com with ESMTPS id 2sm8688710faf.3.2010.05.22.02.03.34 (version=SSLv3 cipher=RC4-MD5); Sat, 22 May 2010 02:03:34 -0700 (PDT) Message-Id: <864oi0wbof.fsf@gmail.com> Date: Sat, 22 May 2010 13:03:28 +0400 From: Anonymous To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: conf/146821: [patch] texinfo/info: respect LOCALBASE for INFODIR X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 May 2010 09:10:02 -0000 >Number: 146821 >Category: conf >Synopsis: [patch] texinfo/info: respect LOCALBASE for INFODIR >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat May 22 09:10:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Anonymous >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: LOCALBASE=/usr/pkg >Description: /usr/local is defined in bsd.port.mk. So, pick up non-default LOCALBASE from environ(7) or make.conf(5). Workaround: export INFOPATH=$LOCALBASE/info >How-To-Repeat: >Fix: --- a.diff begins here --- Index: gnu/usr.bin/texinfo/info/Makefile =================================================================== --- gnu/usr.bin/texinfo/info/Makefile (revision 208404) +++ gnu/usr.bin/texinfo/info/Makefile (working copy) @@ -8,8 +8,14 @@ infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \ signals.c terminal.c tilde.c variables.c window.c -CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\" +CFLAGS+= -DINFODIR=\"${INFODIR}:${INFOLOCALDIR}:.\" +.if defined(LOCALBASE) +INFOLOCALDIR=${LOCALBASE}/info +.else +INFOLOCALDIR=/usr/local/info +.endif + DPADD= ${LIBTERMCAP} ${LIBTXI} LDADD= -ltermcap ${LIBTXI} --- a.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: