From owner-svn-src-head@freebsd.org Fri Sep 18 23:49:34 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D39419D0C91; Fri, 18 Sep 2015 23:49:34 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C38691970; Fri, 18 Sep 2015 23:49:34 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8INnY08050923; Fri, 18 Sep 2015 23:49:34 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8INnXoT050918; Fri, 18 Sep 2015 23:49:33 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201509182349.t8INnXoT050918@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 18 Sep 2015 23:49:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287980 - in head: gnu/usr.bin/groff/src/utils/indxbib lib/liblzma lib/libusb lib/libz X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Sep 2015 23:49:35 -0000 Author: bdrewery Date: Fri Sep 18 23:49:32 2015 New Revision: 287980 URL: https://svnweb.freebsd.org/changeset/base/287980 Log: Replace beforeinstall: handling with FILES. This actually fixes some cases to respect LIBRARIES_ONLY. Sponsored by: EMC / Isilon Storage Division Modified: head/gnu/usr.bin/groff/src/utils/indxbib/Makefile head/lib/liblzma/Makefile head/lib/libusb/Makefile head/lib/libz/Makefile Modified: head/gnu/usr.bin/groff/src/utils/indxbib/Makefile ============================================================================== --- head/gnu/usr.bin/groff/src/utils/indxbib/Makefile Fri Sep 18 23:34:47 2015 (r287979) +++ head/gnu/usr.bin/groff/src/utils/indxbib/Makefile Fri Sep 18 23:49:32 2015 (r287980) @@ -5,9 +5,7 @@ SRCS= indxbib.cpp signal.c DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} LDADD= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= ${MAN} - -beforeinstall: - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${DIST_DIR}/eign ${DESTDIR}${SHAREDIR}/dict/ +FILES= ${DIST_DIR}/eign +FILESDIR= ${SHAREDIR}/dict/ .include Modified: head/lib/liblzma/Makefile ============================================================================== --- head/lib/liblzma/Makefile Fri Sep 18 23:34:47 2015 (r287979) +++ head/lib/liblzma/Makefile Fri Sep 18 23:49:32 2015 (r287980) @@ -154,10 +154,11 @@ CFLAGS+= -DSYMBOL_VERSIONING CLEANFILES+= liblzma.pc -.if !defined(LIBRARIES_ONLY) -all: liblzma.pc +FILES= liblzma.pc +FILESDIR= ${LIBDATADIR}/pkgconfig + liblzma.pc: liblzma.pc.in - @sed -e 's,@prefix@,/usr,g ; \ + sed -e 's,@prefix@,/usr,g ; \ s,@exec_prefix@,/usr,g ; \ s,@libdir@,/usr/lib,g ; \ s,@includedir@,/usr/include,g ; \ @@ -166,9 +167,4 @@ liblzma.pc: liblzma.pc.in s,@PTHREAD_CFLAGS@,,g ; \ s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET} -beforeinstall: - @${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - liblzma.pc ${DESTDIR}${LIBDATADIR}/pkgconfig -.endif - .include Modified: head/lib/libusb/Makefile ============================================================================== --- head/lib/libusb/Makefile Fri Sep 18 23:34:47 2015 (r287979) +++ head/lib/libusb/Makefile Fri Sep 18 23:49:32 2015 (r287980) @@ -35,16 +35,9 @@ SRCS+= libusb10_io.c .if defined(COMPAT_32BIT) CFLAGS+= -DCOMPAT_32BIT -.endif - -.ifndef COMPAT_32BIT -beforeinstall: - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDATADIR}/pkgconfig - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig +.else +FILES= libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc +FILESDIR= ${LIBDATADIR}/pkgconfig .endif # Modified: head/lib/libz/Makefile ============================================================================== --- head/lib/libz/Makefile Fri Sep 18 23:34:47 2015 (r287979) +++ head/lib/libz/Makefile Fri Sep 18 23:49:32 2015 (r287980) @@ -69,9 +69,8 @@ test: example minigzip echo hello world | ./minigzip | ./minigzip -d ) .ifndef COMPAT_32BIT -beforeinstall: - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${.CURDIR}/zlib.pc ${DESTDIR}${LIBDATADIR}/pkgconfig +FILES= zlib.pc +FILESDIR= ${LIBDATADIR}/pkgconfig .endif .include