From d111d66f3859509ea106b01c155e67adfa67d2fc Mon Sep 17 00:00:00 2001 From: Alexandre Anriot Date: Fri, 30 Mar 2007 17:24:14 +0000 Subject: - add an INSTALL_DATA target in bsd.xorg.mk (inspired by bsd.port.mk). - start using it in fvwm, ssh-askpass and xsystrace (more to come). ok matthieu@ --- app/xsystrace/Makefile | 4 ++-- app/xsystrace/pixmaps/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/xsystrace') diff --git a/app/xsystrace/Makefile b/app/xsystrace/Makefile index fb3bed68b..f320b8792 100644 --- a/app/xsystrace/Makefile +++ b/app/xsystrace/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2006/12/02 16:28:48 matthieu Exp $ +# $OpenBSD: Makefile,v 1.7 2007/03/30 17:24:13 aanriot Exp $ PROG= xsystrace MAN= xsystrace.1 @@ -13,7 +13,7 @@ LDADD+= -L${X11BASE}/lib -lXaw -lXt -lXmu -lX11 -lXext SRCS= main.c interface.c callbacks.c policy.c afterinstall: - ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \ + ${INSTALL_DATA} \ ${.CURDIR}/Xsystrace.ad ${DESTDIR}/etc/X11/app-defaults/Xsystrace X11BASE?= /usr/X11R6 diff --git a/app/xsystrace/pixmaps/Makefile b/app/xsystrace/pixmaps/Makefile index ea7caa92c..f503b37df 100644 --- a/app/xsystrace/pixmaps/Makefile +++ b/app/xsystrace/pixmaps/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2006/11/27 20:19:57 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2007/03/30 17:24:13 aanriot Exp $ .include PIXMAPS= deny-always.xpm deny.xpm logo.xpm permit-always.xpm \ @@ -6,9 +6,9 @@ PIXMAPS= deny-always.xpm deny.xpm logo.xpm permit-always.xpm \ install: @for f in ${PIXMAPS}; do \ - echo "${INSTALL} ${INSTALL_COPY} $$f \ + echo "${INSTALL_DATA} $$f \ ${DESTDIR}${INCSDIR}/X11/pixmaps" ; \ - ${INSTALL} ${INSTALL_COPY} ${.CURDIR}/$$f \ + ${INSTALL_DATA} ${.CURDIR}/$$f \ ${DESTDIR}${INCSDIR}/X11/pixmaps ; \ done -- cgit v1.2.3