[src/trunk]: src/x11/share/fonts sanitise use of ${DESTDIR}${SOMEOTHERVAR}

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/745def5fc505
branches:  trunk
changeset: 551845:745def5fc505
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sat Sep 13 00:24:51 2003 +0000

description:
sanitise use of ${DESTDIR}${SOMEOTHERVAR}

diffstat:

 x11/share/fonts/Makefile.mkfontdir     |  10 +++++-----
 x11/share/fonts/bdf/Makefile.bdf       |   4 ++--
 x11/share/fonts/encodings/Makefile.enc |   4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r 12ef8e5948f5 -r 745def5fc505 x11/share/fonts/Makefile.mkfontdir
--- a/x11/share/fonts/Makefile.mkfontdir        Sat Sep 13 00:19:57 2003 +0000
+++ b/x11/share/fonts/Makefile.mkfontdir        Sat Sep 13 00:24:51 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.mkfontdir,v 1.2 2003/09/12 19:00:14 lukem Exp $
+#      $NetBSD: Makefile.mkfontdir,v 1.3 2003/09/13 00:24:51 lukem Exp $
 
 # Note: needs "install" run in ./encodings  first
 #
@@ -7,12 +7,12 @@
 MKFONTDIR=     ${MKFONTDIRDIR}/mkfontdir
 
 afterinstall:
-       rm -f ${DESTDIR}/${FILESDIR}/fonts.dir
-       ${MKFONTDIR} ${DESTDIR}/${FILESDIR}
+       rm -f ${DESTDIR}${FILESDIR}/fonts.dir
+       ${MKFONTDIR} ${DESTDIR}${FILESDIR}
 .if ${MKUNPRIVED} != "no"
        echo ".${FILESDIR}/fonts.dir type=file mode=0444 uname=root gname=wheel" \
            | ${METALOG.add}
 .endif
        ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
-           ${DESTDIR}/${X11FONTDIR}/encodings/encodings.dir \
-           ${DESTDIR}/${FILESDIR}/encodings.dir
+           ${DESTDIR}${X11FONTDIR}/encodings/encodings.dir \
+           ${DESTDIR}${FILESDIR}/encodings.dir
diff -r 12ef8e5948f5 -r 745def5fc505 x11/share/fonts/bdf/Makefile.bdf
--- a/x11/share/fonts/bdf/Makefile.bdf  Sat Sep 13 00:19:57 2003 +0000
+++ b/x11/share/fonts/bdf/Makefile.bdf  Sat Sep 13 00:24:51 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bdf,v 1.1.1.1 2003/09/11 18:55:44 lukem Exp $
+#      $NetBSD: Makefile.bdf,v 1.2 2003/09/13 00:24:52 lukem Exp $
 
 FILESDIR=      ${X11FONTDIR}/${FONTSUBDIR}
 .PATH:         ${X11SRCDIR.xc}/fonts/bdf/${FONTSUBDIR}
@@ -15,7 +15,7 @@
 
 .for _F _M in ${UCSFILES}                                              # {
 ${_F}-${_M}.bdf: ${_F}.bdf
-       ${UCS2ANY} ${.ALLSRC} ${DESTDIR}/${X11FONTDIR}/util/map-${_M} ${_M}
+       ${UCS2ANY} ${.ALLSRC} ${DESTDIR}${X11FONTDIR}/util/map-${_M} ${_M}
 
 CLEANFILES+=   ${_F}-${_M}.bdf
 BDFFILES+=     ${_F}-${_M}.bdf
diff -r 12ef8e5948f5 -r 745def5fc505 x11/share/fonts/encodings/Makefile.enc
--- a/x11/share/fonts/encodings/Makefile.enc    Sat Sep 13 00:19:57 2003 +0000
+++ b/x11/share/fonts/encodings/Makefile.enc    Sat Sep 13 00:24:51 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.enc,v 1.2 2003/09/12 19:00:16 lukem Exp $
+#      $NetBSD: Makefile.enc,v 1.3 2003/09/13 00:24:53 lukem Exp $
 
 FILESDIR=      ${X11FONTDIR}/${ENCDIR}
 .PATH:         ${X11SRCDIR.xc}/fonts/${ENCDIR}
@@ -22,7 +22,7 @@
 MKFONTDIR=     ${MKFONTDIRDIR}/mkfontdir
 
 afterinstall:
-       (cd ${DESTDIR}/${FILESDIR} && \
+       (cd ${DESTDIR}${FILESDIR} && \
            rm -f encodings.dir ; \
            ${MKFONTDIR} -n -r -p ${X11FONTDIR}/${ENCDIR}/ -e . ${ENCARGS} . ; \
        )