qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use INSTALL_DATA in BSD Makefiles. ok oga@

Browse Source
This commit is contained in:
matthieu 2010-05-08 14:15:29 +00:00
parent 8fb598d465
commit d9a92f27a6
10 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
distrib/notes/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2007/04/04 15:24:27 aanriot Exp $
# $OpenBSD: Makefile,v 1.5 2010/05/08 14:15:29 matthieu Exp $
FILE= README.${MACHINE}
@ -10,12 +10,10 @@ ${FILE}.generated: ${FILE} m4.common
m4 ${.CURDIR}/m4.common ${.CURDIR}/${FILE} > ${FILE}.generated
install: ${FILE}.generated
${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 444 ${FILE}.generated \
${DESTDIR}/usr/X11R6/README
${INSTALL_DATA} ${FILE}.generated ${DESTDIR}/usr/X11R6/README
.for set in ${sets}
if [ -d ${DESTDIR}/var/db/pkg/${set}-${OSREV} ]; then \
${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 444 \
DESCR.${set} \
${INSTALL_DATA} DESCR.${set} \
${DESTDIR}/var/db/pkg/${set}-${OSREV}/+DESCR; \
${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 755 \
DEINSTALL \

13
lib/freetype/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2010/03/25 20:32:36 matthieu Exp $
# $OpenBSD: Makefile,v 1.16 2010/05/08 14:15:29 matthieu Exp $
FREETYPESRC= ${.CURDIR}/src
@ -37,24 +37,21 @@ build:
includes:: _SUBDIRUSE
@cmp -s ${DESTDIR}${X11BASE}/include/ft2build.h \
${.CURDIR}/builds/unix/ft2unix.h || \
${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) \
${.CURDIR}/builds/unix/ft2unix.h \
${INSTALL_DATA} ${.CURDIR}/builds/unix/ft2unix.h \
${DESTDIR}${X11BASE}/include/ft2build.h
includes::
@cmp -s ${DESTDIR}${X11BASE}/include/freetype2/freetype/config/ftconfig.h \
${.CURDIR}/builds/unix/ftconfig.h || \
${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) \
${.CURDIR}/builds/unix/ftconfig.h \
${INSTALL_DATA} ${.CURDIR}/builds/unix/ftconfig.h \
${DESTDIR}${X11BASE}/include/freetype2/freetype/config/ftconfig.h
includes:: freetype2.pc
${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) \
freetype2.pc ${DESTDIR}${X11BASE}/lib/pkgconfig
${INSTALL_DATA} freetype2.pc ${DESTDIR}${X11BASE}/lib/pkgconfig
includes:: freetype-config
${INSTALL} ${INSTALL_COPY} -m 755 -o $(BINOWN) -g $(BINGRP) \
freetype-config ${DESTDIR}${X11BASE}/bin
freetype-config ${DESTDIR}${X11BASE}/bin
freetype2.pc: freetype2.in Makefile
sed -e s%@prefix@%${X11BASE}% -e s%@exec_prefix@%${X11BASE}% \

3
lib/freetype/include/freetype/Makefile.inc
View File

@ -3,8 +3,7 @@ includes: ${INCS} incinstall _SUBDIRUSE
incinstall:
for i in ${INCS}; do \
j="cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
$$i ${DESTDIR}${INCSDIR}"; \
${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}"; \
echo "\tinstalling $$i"; \
eval "$$j"; \
done

5
lib/libGL/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2009/05/25 18:40:11 matthieu Exp $
# $OpenBSD: Makefile,v 1.26 2010/05/08 14:15:29 matthieu Exp $
.include <bsd.xconf.mk>
.if ${XENOCARA_BUILD_DRI:L} == "yes"
@ -128,8 +128,7 @@ SRCS = $(GLX_SOURCES) \
includes: _SUBDIRUSE
cd ${MESA_INCLUDE}/GL; for i in ${INCS}; do \
j="cmp -s $$i ${DESTDIR}${INCSDIR}/GL/$$i || \
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
$$i ${DESTDIR}${INCSDIR}/GL"; \
${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/GL"; \
echo "\tinstalling $$i"; \
eval "$$j"; \
done

5
lib/libGL/dri/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2009/05/17 20:20:23 matthieu Exp $
# $OpenBSD: Makefile,v 1.8 2010/05/08 14:15:29 matthieu Exp $
SUBDIR= swrast
@ -20,8 +20,7 @@ INCS = \
includes:
cd ${MESA_INCLUDE}/GL/internal; for i in ${INCS}; do \
j="cmp -s $$i ${DESTDIR}${INCSDIR}/GL/internal/$$i || \
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
$$i ${DESTDIR}${INCSDIR}/GL/internal"; \
${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/GL/internal"; \
echo "\tinstalling $$i"; \
eval "$$j"; \
done

6
lib/libGLU/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2009/05/25 18:40:11 matthieu Exp $
# $OpenBSD: Makefile,v 1.11 2010/05/08 14:15:29 matthieu Exp $
.include <bsd.own.mk>
USE_GCC3?=No
@ -135,8 +135,8 @@ obj: _xenocara_obj
includes:
@cmp -s ${DIST}/include/GL/glu.h \
${DESTDIR}${X11BASE}/include/GL/glu.h \
|| ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
${DIST}/include/GL/glu.h ${DESTDIR}${X11BASE}/include/GL
|| ${INSTALL_DATA} ${DIST}/include/GL/glu.h \
${DESTDIR}${X11BASE}/include/GL
glu.pc: ${DIST}/src/glu/glu.pc.in Makefile
sed -e 's,@INSTALL_DIR@,$(X11BASE),' \

5
lib/libGLw/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2009/05/25 18:40:11 matthieu Exp $
# $OpenBSD: Makefile,v 1.12 2010/05/08 14:15:29 matthieu Exp $
DEBUG?=
@ -28,8 +28,7 @@ obj: _xenocara_obj
includes:
cd ${.CURDIR}; for i in ${INCS}; do \
j="cmp -s $$i ${DESTDIR}${INCSDIR}/GL/$$i || \
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
$$i ${DESTDIR}${INCSDIR}/GL"; \
${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/GL"; \
echo "\tinstalling $$i"; \
eval "$$j"; \
done

5
lib/libdrm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2009/06/27 10:02:53 matthieu Exp $
# $OpenBSD: Makefile,v 1.5 2010/05/08 14:15:29 matthieu Exp $
.include <bsd.xconf.mk>
.include "${.CURDIR}/Makefile.inc"
@ -30,8 +30,7 @@ SRCS= xf86drm.c \
includes: _SUBDIRUSE
cd ${.CURDIR}; for i in ${INCS}; do \
j="cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
$$i ${DESTDIR}${INCSDIR}/"; \
${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/"; \
echo "\tinstalling $$i"; \
eval "$$j"; \
done

5
lib/libdrm/intel/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2009/06/27 10:02:53 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2010/05/08 14:15:29 matthieu Exp $
.include <bsd.xconf.mk>
LIB= drm_intel
@ -24,8 +24,7 @@ LDADD+= -L${X11BASE}/lib -lX11
includes:
cd ${.CURDIR}; for i in ${INCS}; do \
j="cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
$$i ${DESTDIR}${INCSDIR}/"; \
${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/"; \
echo "\tinstalling $$i"; \
eval "$$j"; \
done

5
share/mk/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2008/03/25 23:41:50 matthieu Exp $
# $OpenBSD: Makefile,v 1.4 2010/05/08 14:15:29 matthieu Exp $
.include <bsd.own.mk>
@ -7,7 +7,6 @@ FILES= automake.dep bsd.xconf.mk bsd.xorg.mk
all:
install::
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
${DESTDIR}${X11BASE}/share/mk
${INSTALL_DATA} ${FILES} ${DESTDIR}${X11BASE}/share/mk
.include <bsd.xorg.mk>