diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-08-24 10:41:22 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-08-24 10:41:22 +0000 |
| commit | 399145776063590402f488921fb925fc09c9a4f7 (patch) | |
| tree | a735ca0f8da009e69ac182d858b2c7f396e0d22b | |
| parent | c1aaf3396977189e81099549074c34490ae334ee (diff) | |
/usr/share/sysmerge -> /var/sysmerge
requested by several
discussed with deraadt@
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | distrib/sets/Makefile | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/mi | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/xetc/mi | 2 | ||||
| -rwxr-xr-x | distrib/sets/makexetc | 4 |
5 files changed, 10 insertions, 10 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.67 2015/08/23 18:50:33 deraadt Exp $ +# $OpenBSD: Makefile,v 1.68 2015/08/24 10:41:21 ajacoutot Exp $ .include <bsd.own.mk> .include <bsd.xconf.mk> @@ -59,10 +59,10 @@ beforeinstall beforebuild: afterinstall afterbuild: exec ${MAKE} fix-appd /usr/sbin/makewhatis -Qv ${DESTDIR}/usr/X11R6/man - touch ${DESTDIR}/usr/share/sysmerge/xetcsum + touch ${DESTDIR}/var/sysmerge/xetcsum cd ${DESTDIR}/ && \ sort ${.CURDIR}/distrib/sets/lists/xetc/{mi,md.${MACHINE}} | \ - xargs sha256 -h ${DESTDIR}/usr/share/sysmerge/xetcsum || true + xargs sha256 -h ${DESTDIR}/var/sysmerge/xetcsum || true cd distrib/sets && exec ${MAKE} install-mk: diff --git a/distrib/sets/Makefile b/distrib/sets/Makefile index 8c9773431..3ffba8ef5 100644 --- a/distrib/sets/Makefile +++ b/distrib/sets/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.3 2014/08/28 17:11:19 matthieu Exp $ +# $OpenBSD: Makefile,v 1.4 2015/08/24 10:41:21 ajacoutot Exp $ DB = /usr/X11R6/lib/locate/xorg.db -XETC = ${DESTDIR}/usr/share/sysmerge/xetc.tgz +XETC = ${DESTDIR}/var/sysmerge/xetc.tgz all: tarxetc makedb diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi index c5cbdf833..36d318ceb 100644 --- a/distrib/sets/lists/xbase/mi +++ b/distrib/sets/lists/xbase/mi @@ -427,9 +427,9 @@ ./usr/X11R6/share/xcb/xcb.xsd ./usr/X11R6/share/xcb/xkb.xml ./usr/share -./usr/share/sysmerge -./usr/share/sysmerge/xetc.tgz ./var ./var/cache ./var/cache/fontconfig ./var/cache/fontconfig/CACHEDIR.TAG +./var/sysmerge +./var/sysmerge/xetc.tgz diff --git a/distrib/sets/lists/xetc/mi b/distrib/sets/lists/xetc/mi index 312f06ede..0ab48c376 100644 --- a/distrib/sets/lists/xetc/mi +++ b/distrib/sets/lists/xetc/mi @@ -34,4 +34,4 @@ ./etc/fonts/conf.d/69-unifont.conf ./etc/fonts/conf.d/80-delicious.conf ./etc/fonts/conf.d/90-synthetic.conf -./usr/share/sysmerge/xetcsum +./var/sysmerge/xetcsum diff --git a/distrib/sets/makexetc b/distrib/sets/makexetc index c854d73a0..0b4db8551 100755 --- a/distrib/sets/makexetc +++ b/distrib/sets/makexetc @@ -1,9 +1,9 @@ #!/bin/sh -# $OpenBSD: makexetc,v 1.1 2014/08/28 17:08:33 matthieu Exp $ +# $OpenBSD: makexetc,v 1.2 2015/08/24 10:41:21 ajacoutot Exp $ pwd=`pwd` listsdir=`pwd`/lists -tardir=$DESTDIR/usr/share/sysmerge +tardir=$DESTDIR/var/sysmerge TMP=`mktemp /tmp/_makexetc.XXXXXXXXXX` || exit 1 trap 'rm -f $TMP' 0 1 15 |