summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2014-11-27 11:37:46 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2014-11-27 11:37:46 +0000
commit0abe65e7cc6dfec9a6aecb1971223c5f545494e7 (patch)
tree554bf2bfd15e3ab84634ff36aa51f4eaede86404
parent4dfc6e30018e85f7355a6d5fca427621f10f1348 (diff)
Create xetcsum at build time like we do in src. This prevents ending up
with an empty file... issue reported by sthen@ ok rpe@
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index e2d0c6250..4d111d45e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.62 2014/09/28 20:48:59 rpe Exp $
+# $OpenBSD: Makefile,v 1.63 2014/11/27 11:37:45 ajacoutot Exp $
.include <bsd.own.mk>
.include <bsd.xconf.mk>
@@ -53,6 +53,10 @@ beforeinstall beforebuild:
afterinstall afterbuild:
exec ${MAKE} fix-appd
/usr/sbin/makewhatis -Qv ${DESTDIR}/usr/X11R6/man
+ touch ${DESTDIR}/usr/share/sysmerge/xetcsum
+ cd ${DESTDIR}/ && \
+ sort ${.CURDIR}/distrib/sets/lists/xetc/{mi,md.${MACHINE}} | \
+ xargs sha256 -h ${DESTDIR}/usr/share/sysmerge/xetcsum || true
cd distrib/sets && exec ${MAKE}
install-mk:
@@ -109,11 +113,7 @@ release-install:
${XCONFIG} ${DESTDIR}/etc/X11 ; \
fi
.endif
- touch ${DESTDIR}/usr/share/sysmerge/xetcsum
@exec ${MAKE} install
- cd ${DESTDIR} && \
- sort ${.CURDIR}/distrib/sets/lists/xetc/{mi,md.${MACHINE}} | \
- xargs sha256 -h ${DESTDIR}/usr/share/sysmerge/xetcsum || true
dist-rel:
${MAKE} RELEASEDIR=`pwd`/rel DESTDIR=`pwd`/dest dist 2>&1 | tee distlog