[src/trunk]: src/sys/arch revert previous MAKEOBJDIRPREFIX massaging

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

details:   https://anonhg.NetBSD.org/src/rev/88fedbaa7140
branches:  trunk
changeset: 362496:88fedbaa7140
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jun 13 16:03:10 2018 +0000

description:
revert previous MAKEOBJDIRPREFIX massaging

diffstat:

 sys/arch/acorn32/stand/lib/Makefile.inc     |  4 ++--
 sys/arch/hppa/spmath/Makefile.inc           |  4 ++--
 sys/arch/i386/stand/lib/Makefile.inc        |  4 ++--
 sys/arch/ia64/stand/efi/libefi/Makefile.inc |  4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 6b43115f1720 -r 88fedbaa7140 sys/arch/acorn32/stand/lib/Makefile.inc
--- a/sys/arch/acorn32/stand/lib/Makefile.inc   Wed Jun 13 15:46:26 2018 +0000
+++ b/sys/arch/acorn32/stand/lib/Makefile.inc   Wed Jun 13 16:03:10 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.5 2018/06/11 21:36:20 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2018/06/13 16:03:44 christos Exp $
 #
 #      Configuration variables (default values are below):
 #
@@ -22,7 +22,7 @@
 RISCOSMAKE= \
        cd ${RISCOSDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
          MAKEOBJDIR=${RISCOSDST} ${MAKE} \
-           CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
+           CC=${CC:q} CFLAGS=${CFLAGS:q} \
            AS=${AS:q} AFLAGS=${AFLAGS:q} \
            LD=${LD:q} STRIP=${STRIP:q} \
            MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
diff -r 6b43115f1720 -r 88fedbaa7140 sys/arch/hppa/spmath/Makefile.inc
--- a/sys/arch/hppa/spmath/Makefile.inc Wed Jun 13 15:46:26 2018 +0000
+++ b/sys/arch/hppa/spmath/Makefile.inc Wed Jun 13 16:03:10 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.11 2018/06/11 21:37:29 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.12 2018/06/13 16:05:14 christos Exp $
 
 #      $OpenBSD: Makefile.inc,v 1.4 2001/03/29 03:58:17 mickey Exp $
 #
@@ -15,7 +15,7 @@
 SPMATHMAKE= \
        cd ${SPMATHDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
          MAKEOBJDIR=${SPMATHDST} ${MAKE} \
-           CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
+           CC=${CC:q} CFLAGS=${CFLAGS:q} \
            SPMATHCPPFLAGS=${CPPFLAGS:S@^-I.@-I. -I../../.@g:q} \
            AS=${AS:q} AFLAGS=${AFLAGS:q} \
            LD=${LD:q} STRIP=${STRIP:q} \
diff -r 6b43115f1720 -r 88fedbaa7140 sys/arch/i386/stand/lib/Makefile.inc
--- a/sys/arch/i386/stand/lib/Makefile.inc      Wed Jun 13 15:46:26 2018 +0000
+++ b/sys/arch/i386/stand/lib/Makefile.inc      Wed Jun 13 16:03:10 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.18 2018/06/11 21:35:13 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.19 2018/06/13 16:03:10 christos Exp $
 #
 #      Configuration variables (default values are below):
 #
@@ -24,7 +24,7 @@
 I386MAKE= \
        cd ${I386DIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
            MAKEOBJDIR=${I386DST} ${MAKE} \
-           CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
+           CC=${CC:q} CFLAGS=${CFLAGS:q} \
            AS=${AS:q} AFLAGS=${AFLAGS:q} \
            LD=${LD:q} STRIP=${STRIP:q} \
            MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
diff -r 6b43115f1720 -r 88fedbaa7140 sys/arch/ia64/stand/efi/libefi/Makefile.inc
--- a/sys/arch/ia64/stand/efi/libefi/Makefile.inc       Wed Jun 13 15:46:26 2018 +0000
+++ b/sys/arch/ia64/stand/efi/libefi/Makefile.inc       Wed Jun 13 16:03:10 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.6 2018/06/11 21:38:27 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2018/06/13 16:04:55 christos Exp $
 #
 #      Configuration variables (default values are below):
 #
@@ -22,7 +22,7 @@
 EFIMAKE= \
        cd ${EFIDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
            MAKEOBJDIR=${EFIDST} ${MAKE} \
-           CC=${CC:q} CFLAGS=${CFLAGS:S/MAKEOBJDIRPREFIX/MAKEOBJDIR/:q} \
+           CC=${CC:q} CFLAGS=${CFLAGS:q} \
            AS=${AS:q} AFLAGS=${AFLAGS:q} \
            LD=${LD:q} STRIP=${STRIP:q} \
            MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \