- 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@

6 files changed, 23 insertions, 20 deletions

diff --git a/app/fvwm/icons/Makefile b/app/fvwm/icons/Makefile
index f1ef7ed1d..b3be0cda6 100644
--- a/app/fvwm/icons/Makefile
+++ b/app/fvwm/icons/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2006/12/09 15:31:01 matthieu Exp $
+# $OpenBSD: Makefile,v 1.4 2007/03/30 17:24:12 aanriot Exp $
 
 .include "../Makefile.inc"
 
@@ -52,15 +52,15 @@ all:
 
 install:
 	@for f in ${BITMAPS}; do \
-		echo "${INSTALL} ${INSTALL_COPY} $$f \
+		echo "${INSTALL_DATA} $$f \
 			${DESTDIR}${INCSDIR}/X11/bitmaps" ; \
-		${INSTALL} ${INSTALL_COPY} ${.CURDIR}/$$f \
+		${INSTALL_DATA} ${.CURDIR}/$$f \
 			${DESTDIR}${INCSDIR}/X11/bitmaps ; \
 	done 
 	@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 
 
diff --git a/app/fvwm/sample.fvwmrc/Makefile b/app/fvwm/sample.fvwmrc/Makefile
index 0a5412b5c..d12f56135 100644
--- a/app/fvwm/sample.fvwmrc/Makefile
+++ b/app/fvwm/sample.fvwmrc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2007/03/27 19:49:43 matthieu Exp $
+# $OpenBSD: Makefile,v 1.6 2007/03/30 17:24:12 aanriot Exp $
 
 .include "../Makefile.inc"
 
@@ -12,17 +12,17 @@ all:
 		${.CURDIR}/system.fvwmrc > .fvwmrc
 
 install:
-	${INSTALL} ${INSTALL_COPY} .fvwmrc \
+	${INSTALL_DATA} .fvwmrc \
 		${DESTDIR}${FVWMLIBDIR}/.fvwmrc
-	${INSTALL} ${INSTALL_COPY} ${.CURDIR}/system.fvwm2rc \
+	${INSTALL_DATA} ${.CURDIR}/system.fvwm2rc \
 		${DESTDIR}${FVWMLIBDIR}
-	${INSTALL} ${INSTALL_COPY} ${.CURDIR}/decor_examples \
+	${INSTALL_DATA} ${.CURDIR}/decor_examples \
 		${DESTDIR}${FVWMLIBDIR}
-	${INSTALL} ${INSTALL_COPY} ${.CURDIR}/new-features \
+	${INSTALL_DATA} ${.CURDIR}/new-features \
 		${DESTDIR}${FVWMLIBDIR}
-	${INSTALL} ${INSTALL_COPY} ${.CURDIR}/system.fvwm2rc-sample-1 \
+	${INSTALL_DATA} ${.CURDIR}/system.fvwm2rc-sample-1 \
 		${DESTDIR}${FVWMLIBDIR}
-	${INSTALL} ${INSTALL_COPY} ${.CURDIR}/system.fvwm2rc-sample-2 \
+	${INSTALL_DATA} ${.CURDIR}/system.fvwm2rc-sample-2 \
 		${DESTDIR}${FVWMLIBDIR}
 
 clean:
diff --git a/app/ssh-askpass/Makefile b/app/ssh-askpass/Makefile
index 590eca068..3fef503de 100644
--- a/app/ssh-askpass/Makefile
+++ b/app/ssh-askpass/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2007/01/07 14:04:46 matthieu Exp $
+# $OpenBSD: Makefile,v 1.6 2007/03/30 17:24:13 aanriot Exp $
 
 .include	<bsd.own.mk>
 X11BASE?=	/usr/X11R6
@@ -30,7 +30,7 @@ $(CLASS).ad: $(APP_DEFAULTS)
 	ln -s $(.CURDIR)/$(APP_DEFAULTS) $(CLASS).ad
 
 afterinstall:
-	$(INSTALL) $(INSTALL_COPY)  -o $(BINOWN) -g $(BINGRP) $(CLASS).ad \
+	${INSTALL_DATA} $(CLASS).ad \
 		$(DESTDIR)/etc/X11/app-defaults/$(CLASS)
 
 beforedepend: $(CLASS)_ad.h
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 <bsd.own.mk>
 
 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 
 
diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk
index b2938b5f8..8a008082f 100644
--- a/share/mk/bsd.xorg.mk
+++ b/share/mk/bsd.xorg.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xorg.mk,v 1.17 2007/03/30 07:11:06 espie Exp $ -*- makefile  -*-
+# $OpenBSD: bsd.xorg.mk,v 1.18 2007/03/30 17:24:12 aanriot Exp $ -*- makefile  -*-
 #
 # Copyright © 2006 Matthieu Herrb
 #
@@ -36,6 +36,9 @@ MANDIR=			${X11BASE}/man/cat
 
 PKG_CONFIG_LIBDIR=	${X11BASE}/lib/pkgconfig
 
+# A few aliases for *-install targets
+INSTALL_DATA = ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 644
+
 # Autoconf cache
 _cache= --cache-file=${XENOCARA_OBJDIR}/xorg-config.cache.${MACHINE}