Module Name: src
Committed By: apb
Date: Mon Sep 12 13:38:43 UTC 2011
Modified Files:
src/external/mit/xorg/share/fonts: Makefile.fccache
src/x11/share/fonts: Makefile
Log Message:
Use find .${X11FONTDIR}, not find ./${X11FONTDIR}, because ${X11FONTDIR}
starts with "/". This should fix issues involving .//usr/X11R7 instead
of ./usr/X11R7 in METALOG during the build for some ports.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/share/fonts/Makefile.fccache
cvs rdiff -u -r1.6 -r1.7 src/x11/share/fonts/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/share/fonts/Makefile.fccache
diff -u src/external/mit/xorg/share/fonts/Makefile.fccache:1.2 src/external/mit/xorg/share/fonts/Makefile.fccache:1.3
--- src/external/mit/xorg/share/fonts/Makefile.fccache:1.2 Sat Oct 25 22:27:34 2008
+++ src/external/mit/xorg/share/fonts/Makefile.fccache Mon Sep 12 13:38:43 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.fccache,v 1.2 2008/10/25 22:27:34 apb Exp $
+# $NetBSD: Makefile.fccache,v 1.3 2011/09/12 13:38:43 apb Exp $
.ifndef _MAKEFILE_FCCACHE_
_MAKEFILE_FCCACHE_=1
@@ -12,7 +12,7 @@
${FCCACHE} -fv ${DESTDIR}${X11FONTDIR}
.if ${MKUNPRIVED} != "no"
cd ${DESTDIR} \
- && find ./${X11FONTDIR} -name fonts.cache-1 \
+ && find .${X11FONTDIR} -name fonts.cache-1 \
| ${TOOL_SED} -e \
's/$$/ type=file mode=0444 uname=${BINOWN} gname=${BINGRP}/' \
| ${METALOG.add}
Index: src/x11/share/fonts/Makefile
diff -u src/x11/share/fonts/Makefile:1.6 src/x11/share/fonts/Makefile:1.7
--- src/x11/share/fonts/Makefile:1.6 Sat Oct 25 22:27:39 2008
+++ src/x11/share/fonts/Makefile Mon Sep 12 13:38:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:39 apb Exp $
+# $NetBSD: Makefile,v 1.7 2011/09/12 13:38:42 apb Exp $
.include <bsd.own.mk>
@@ -12,7 +12,7 @@
${FCCACHE} -fv ${DESTDIR}${X11FONTDIR}
.if ${MKUNPRIVED} != "no"
cd ${DESTDIR} \
- && find ./${X11FONTDIR} -name fonts.cache-1 \
+ && find .${X11FONTDIR} -name fonts.cache-1 \
| ${TOOL_SED} -e \
's/$$/ type=file mode=0444 uname=${BINOWN} gname=${BINGRP}/' \
| ${METALOG.add}
