bin/114200: [patch] 'make NO_INSTALLLIB=1 installworld' fails in usr.bin/lex/lib

[Henrik Brix Andersen]

The following reply was made to PR bin/114200; it has been noted by GNATS.

From: Henrik Brix Andersen <henrik at brixandersen.dk>
To: bug-followup at FreeBSD.org
Cc: "M. Warner Losh" <imp at bsdimp.com>
Subject: bin/114200: [patch] 'make NO_INSTALLLIB=1 installworld' fails in
	usr.bin/lex/lib
Date: Tue, 16 Oct 2007 11:51:49 +0200

 In order for the '.if ${MK_INSTALLLIB} != "no"' solution proposed by
 Warner to work, this patch is needed:
 
 --- share/mk/bsd.own.mk.orig	2007-10-16 01:00:45.000000000 +0200
 +++ share/mk/bsd.own.mk	2007-10-16 01:01:47.000000000 +0200
 @@ -188,6 +188,7 @@ COMPRESS_EXT?=	.gz
  # regardless of user's setting).
  #
  .for var in \
 +    INSTALLLIB \
      MAN \
      PROFILE
  .if defined(NO_${var})
 @@ -322,6 +323,7 @@ WITH_IDEA=
      I4B \
      INET6 \
      INFO \
 +    INSTALLLIB \
      IPFILTER \
      IPX \
      KERBEROS \
 --- usr.bin/lex/lib/Makefile.orig	2006-03-18 22:37:05.000000000 +0100
 +++ usr.bin/lex/lib/Makefile	2007-10-16 00:58:06.000000000 +0200
 @@ -6,8 +6,10 @@ LIB=    ln
  SRCS=   libmain.c libyywrap.c
  NO_PIC=
  
 +.if ${MK_INSTALLLIB} != "no"
  LINKS=  ${LIBDIR}/libln.a ${LIBDIR}/libl.a
  LINKS+=	${LIBDIR}/libln.a ${LIBDIR}/libfl.a
 +.endif
  
  .if ${MK_PROFILE} != "no"
  LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a
 --- lib/ncurses/ncurses/Makefile.orig	2007-10-16 00:58:33.000000000 +0200
 +++ lib/ncurses/ncurses/Makefile	2007-10-16 00:59:03.000000000 +0200
 @@ -280,7 +280,7 @@ INCS=		${HEADERS} ${SRCHDRS}
  INCSLINKS=	curses.h ${INCLUDEDIR}/ncurses.h
  .endif
  
 -.if !defined(NO_INSTALLLIB)
 +.if ${MK_INSTALLLIB} != "no"
  SYMLINKS+=	libncurses${LIB_SUFFIX}.a ${LIBDIR}/libcurses${LIB_SUFFIX}.a
  SYMLINKS+=	libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermcap${LIB_SUFFIX}.a
  SYMLINKS+=	libncurses${LIB_SUFFIX}.a ${LIBDIR}/libtermlib${LIB_SUFFIX}.a
 
 
 -- 
 Henrik Brix Andersen <henrik at brixandersen.dk>