[src/trunk]: src/x11 Use '${DESTDIR}${somepathvar}' instead of '${DESTDIR}/${...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/x11 Use '${DESTDIR}${somepathvar}' instead of '${DESTDIR}/${...
From: lukem <lukem%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 13:44:55 +0000
details:   https://anonhg.NetBSD.org/src/rev/228d8a8b6193
branches:  trunk
changeset: 552686:228d8a8b6193
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Sep 30 06:41:29 2003 +0000

description:
Use '${DESTDIR}${somepathvar}' instead of '${DESTDIR}/${somepathvar}'.
Suggested by Matt Thomas.

diffstat:

 x11/Xserver/GL/GLcore/Makefile      |  6 +++---
 x11/Xserver/GL/glx/Makefile.glx     |  6 +++---
 x11/Xserver/Xext/Makefile.ext       |  6 +++---
 x11/Xserver/cfb/Makefile.cfb        |  6 +++---
 x11/Xserver/dbe/Makefile.dbe        |  6 +++---
 x11/Xserver/dix/Makefile            |  6 +++---
 x11/Xserver/dix/xpstubs/Makefile    |  6 +++---
 x11/Xserver/fb/Makefile             |  6 +++---
 x11/Xserver/hw/vfb/Makefile         |  6 +++---
 x11/Xserver/hw/xnest/Makefile       |  6 +++---
 x11/Xserver/lbx/Makefile            |  6 +++---
 x11/Xserver/mfb/Makefile            |  4 ++--
 x11/Xserver/mi/Makefile             |  6 +++---
 x11/Xserver/os/Makefile             |  6 +++---
 x11/Xserver/printer/Makefile        |  6 +++---
 x11/Xserver/printer/pcl/Makefile    |  4 ++--
 x11/Xserver/printer/ps/Makefile     |  4 ++--
 x11/Xserver/printer/raster/Makefile |  4 ++--
 x11/Xserver/randr/Makefile          |  6 +++---
 x11/Xserver/record/Makefile.record  |  6 +++---
 x11/Xserver/render/Makefile         |  6 +++---
 x11/Xserver/xinput/Makefile         |  6 +++---
 x11/Xserver/xkb/Makefile            |  6 +++---
 x11/Xserver/xtrap/Makefile.xtrap    |  6 +++---
 x11/bin/imake/Makefile              |  4 ++--
 x11/bin/lbxproxy/Makefile           |  6 +++---
 x11/bin/makedepend/Makefile         |  4 ++--
 x11/bin/mkcfm/Makefile              |  4 ++--
 x11/bin/mkfontscale/Makefile        |  4 ++--
 x11/bin/x11perf/Makefile            |  4 ++--
 x11/bin/xclock/Makefile             |  4 ++--
 x11/bin/xditview/Makefile           |  4 ++--
 x11/bin/xfd/Makefile                |  4 ++--
 x11/bin/xlogo/Makefile              |  4 ++--
 x11/bin/xterm/Makefile              |  4 ++--
 x11/lib/FS/Makefile                 |  4 ++--
 x11/lib/GL/Makefile                 |  6 +++---
 x11/lib/OSmesa/Makefile             |  4 ++--
 x11/lib/OSmesa/gen_matypes/Makefile |  4 ++--
 x11/lib/X11/Makefile.libx11         |  4 ++--
 x11/lib/XTrap/Makefile              |  4 ++--
 x11/lib/Xft/Makefile                |  4 ++--
 x11/lib/Xft1/Makefile               |  4 ++--
 x11/lib/Xrandr/Makefile             |  4 ++--
 x11/lib/Xrender/Makefile            |  4 ++--
 x11/lib/Xt/makestrs/Makefile        |  4 ++--
 x11/lib/font/Makefile               |  8 ++++----
 x11/lib/fontconfig/src/Makefile     |  4 ++--
 x11/lib/fontenc/Makefile            |  4 ++--
 x11/lib/freetype2/Makefile          |  4 ++--
 x11/lib/lbxutil/Makefile            |  6 +++---
 x11/lib/oldX/Makefile               |  4 ++--
 x11/tools/bdftopcf/Makefile         |  4 ++--
 x11/tools/fc-cache/Makefile         |  6 +++---
 x11/tools/makekeys/Makefile         |  4 ++--
 x11/tools/mkfontdir/Makefile        |  4 ++--
 x11/tools/pswrap/Makefile           |  4 ++--
 x11/tools/xkbcomp/Makefile          |  4 ++--
 58 files changed, 142 insertions(+), 142 deletions(-)

diffs (truncated from 1125 to 300 lines):

diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/GL/GLcore/Makefile
--- a/x11/Xserver/GL/GLcore/Makefile    Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/GL/GLcore/Makefile    Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2003/09/23 23:21:03 lukem Exp $
+#      $NetBSD: Makefile,v 1.2 2003/09/30 06:41:29 lukem Exp $
 
 XMODULEDIR=    ${X11ROOTDIR}/lib/modules/extensions
 
@@ -60,8 +60,8 @@
 
 XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
 
-CPPFLAGS+=     -I${DESTDIR}/${X11INCDIR}/X11 \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions \
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/extras/Mesa/include \
                -I${X11SRCDIR.xc}/lib/GL/include \
                -I${X11SRCDIR.xc}/extras/Mesa/src \
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/GL/glx/Makefile.glx
--- a/x11/Xserver/GL/glx/Makefile.glx   Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/GL/glx/Makefile.glx   Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.glx,v 1.1 2003/09/23 23:21:04 lukem Exp $
+#      $NetBSD: Makefile.glx,v 1.2 2003/09/30 06:41:29 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -19,9 +19,9 @@
                -I${X11SRCDIR.xc}/programs/Xserver/GL/include \
                -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR} \
-               -I${DESTDIR}/${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/programs/Xserver/mi \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/include/fonts \
                -I${X11SRCDIR.xc}/lib/GL/include
 
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/Xext/Makefile.ext
--- a/x11/Xserver/Xext/Makefile.ext     Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/Xext/Makefile.ext     Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.ext,v 1.2 2003/09/23 23:21:05 lukem Exp $
+#      $NetBSD: Makefile.ext,v 1.3 2003/09/30 06:41:29 lukem Exp $
 
 .include "../Makefile.serverlib"
 
@@ -11,8 +11,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/Xext \
                -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR} \
-               -I${DESTDIR}/${X11INCDIR}/X11 \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/include/fonts \
                -I${X11SRCDIR.xc}/programs/Xserver/mi \
                -I${X11SRCDIR.xc}/programs/Xserver/render \
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/cfb/Makefile.cfb
--- a/x11/Xserver/cfb/Makefile.cfb      Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/cfb/Makefile.cfb      Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.cfb,v 1.4 2003/09/23 23:21:09 lukem Exp $
+#      $NetBSD: Makefile.cfb,v 1.5 2003/09/30 06:41:29 lukem Exp $
 
 XMODULEDIR=    ${X11ROOTDIR}/lib/modules
 
@@ -72,9 +72,9 @@
                -I${X11SRCDIR.xc}/programs/Xserver/cfb24 \
                -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR} \
-               -I${DESTDIR}/${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/include/fonts \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/programs/Xserver/Xext
 
 CPPFLAGS+=     -DPSZ=${PIXELSIZE} -DXFREE86
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/dbe/Makefile.dbe
--- a/x11/Xserver/dbe/Makefile.dbe      Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/dbe/Makefile.dbe      Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.dbe,v 1.1 2003/09/23 23:21:10 lukem Exp $
+#      $NetBSD: Makefile.dbe,v 1.2 2003/09/30 06:41:29 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -11,8 +11,8 @@
 
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR} \
-               -I${DESTDIR}/${X11INCDIR}/X11 \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions
 
 .include <bsd.x11.mk>
 LIBDIR=        ${XMODULEDIR}
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/dix/Makefile
--- a/x11/Xserver/dix/Makefile  Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/dix/Makefile  Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/23 23:21:10 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:29 lukem Exp $
 
 .include "../Makefile.serverlib"
 
@@ -15,9 +15,9 @@
                window.c initatoms.c dixfonts.c privates.c pixmap.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/include \
-               -I${DESTDIR}/${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/include/fonts \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/programs/Xserver/Xext \
                -I${X11SRCDIR.xc}/programs/Xserver/lbx
 
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/dix/xpstubs/Makefile
--- a/x11/Xserver/dix/xpstubs/Makefile  Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/dix/xpstubs/Makefile  Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/09/24 01:55:06 lukem Exp $
+#      $NetBSD: Makefile,v 1.4 2003/09/30 06:41:29 lukem Exp $
 
 .include "../../Makefile.serverlib"
 
@@ -10,9 +10,9 @@
 SRCS=          xpstubs.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/include \
-               -I${DESTDIR}/${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/include/fonts \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/programs/Xserver/Xext \
                -I${X11SRCDIR.xc}/programs/Xserver/lbx
 
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/fb/Makefile
--- a/x11/Xserver/fb/Makefile   Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/fb/Makefile   Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/23 23:21:11 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:29 lukem Exp $
 
 XMODULEDIR=    ${X11ROOTDIR}/lib/modules
 
@@ -23,11 +23,11 @@
                -I${X11SRCDIR.xc}/programs/Xserver/mi \
                -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR} \
-               -I${DESTDIR}/${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/include/fonts \
                -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
                -I${X11SRCDIR.xc}/programs/Xserver/render \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/programs/Xserver/Xext
 
 .include <bsd.x11.mk>
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/hw/vfb/Makefile
--- a/x11/Xserver/hw/vfb/Makefile       Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/hw/vfb/Makefile       Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/23 23:21:11 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:29 lukem Exp $
 
 .include "../../Makefile.serverlib"
 
@@ -14,7 +14,7 @@
 
 XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
 
-CPPFLAGS+=     -I${DESTDIR}/${X11INCDIR}/X11 \
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/include/fonts \
                -I${X11SRCDIR.xc}/programs/Xserver/fb \
                -I${X11SRCDIR.xc}/programs/Xserver/mfb \
@@ -22,7 +22,7 @@
                -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR} \
                -I${X11SRCDIR.xc}/programs/Xserver/os \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/programs/Xserver/render
 
 CPPFLAGS+=     -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR -DDDXOSVERRORF \
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/hw/xnest/Makefile
--- a/x11/Xserver/hw/xnest/Makefile     Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/hw/xnest/Makefile     Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/23 23:21:12 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:29 lukem Exp $
 
 .include "../../Makefile.serverlib"
 
@@ -17,13 +17,13 @@
 XSERVERINCDIR!=        cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
 
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xnest \
-               -I${DESTDIR}/${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/include/fonts \
                -I${X11SRCDIR.xc}/programs/Xserver/mi \
                -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR} \
                -I${X11SRCDIR.xc}/programs/Xserver/os \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions
+               -I${DESTDIR}${X11INCDIR}/X11/extensions
 
 CPPFLAGS+=     -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR -DDDXOSVERRORF \
                ${X11FLAGS.EXTENSION} \
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/lbx/Makefile
--- a/x11/Xserver/lbx/Makefile  Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/lbx/Makefile  Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/23 23:21:12 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:29 lukem Exp $
 
 .include "../Makefile.serverlib"
 
@@ -11,10 +11,10 @@
                lbxprop.c lbxsquish.c lbxswap.c lbxtables.c lbxtags.c \
                lbxzerorep.c
 
-CPPFLAGS+=     -I${DESTDIR}/${X11INCDIR}/X11 \
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/include/fonts \
                -I${X11SRCDIR.xc}/programs/Xserver/include \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions
+               -I${DESTDIR}${X11INCDIR}/X11/extensions
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/mfb/Makefile
--- a/x11/Xserver/mfb/Makefile  Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/mfb/Makefile  Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/09/23 23:21:13 lukem Exp $
+#      $NetBSD: Makefile,v 1.4 2003/09/30 06:41:29 lukem Exp $
 
 XMODULEDIR=    ${X11ROOTDIR}/lib/modules
 
@@ -50,7 +50,7 @@
                -I${X11SRCDIR.xc}/programs/Xserver/mi \
                -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR} \
-               -I${DESTDIR}/${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/include/fonts
 
 CPPFLAGS.mfbseg.c=     -DPOLYSEGMENT 
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/mi/Makefile
--- a/x11/Xserver/mi/Makefile   Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/mi/Makefile   Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/23 23:21:13 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:29 lukem Exp $
 
 .include "../Makefile.serverlib"
 
@@ -20,8 +20,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${X11SRCDIR.xc}/include/fonts \
                -I${X11SRCDIR.xc}/programs/Xserver/render \
-               -I${DESTDIR}/${X11INCDIR}/X11 \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/programs/Xserver/Xext
 
 CPPFLAGS.miinitext.c=  ${X11FLAGS.EXTENSION}
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/os/Makefile
--- a/x11/Xserver/os/Makefile   Tue Sep 30 06:39:09 2003 +0000
+++ b/x11/Xserver/os/Makefile   Tue Sep 30 06:41:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/23 23:21:13 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/30 06:41:29 lukem Exp $
 
 .include "../Makefile.serverlib"
 
@@ -16,8 +16,8 @@
 
 CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/include \
                -I${XSERVERINCDIR} \
-               -I${DESTDIR}/${X11INCDIR}/X11 \
-               -I${DESTDIR}/${X11INCDIR}/X11/extensions \
+               -I${DESTDIR}${X11INCDIR}/X11 \
+               -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/programs/Xserver/Xext \
                -I${X11SRCDIR.xc}/include/fonts \
                -I${X11SRCDIR.xc}/programs/Xserver/render \
diff -r 205f3afc5c6f -r 228d8a8b6193 x11/Xserver/printer/Makefile
Prev by Date: [src/trunk]: src/x11/Xserver/Xserver only pull in -li386 if ${MACHINE_ARCH} =...
Next by Date: [src/trunk]: src/distrib/sets Invoke ./checkflist with ${CHECKFLIST_FLAGS}, s...
Previous by Thread: [src/trunk]: src/x11/Xserver/Xserver only pull in -li386 if ${MACHINE_ARCH} =...
Next by Thread: [src/trunk]: src/distrib/sets Invoke ./checkflist with ${CHECKFLIST_FLAGS}, s...
Indexes:
Home | Main Index | Thread Index | Old Index