svn commit: r207056 - in head: sys/conf usr.sbin/config

[Alexander Leidinger]

Author: netchild
Date: Thu Apr 22 09:20:17 2010
New Revision: 207056
URL: http://svn.freebsd.org/changeset/base/207056

Log:
  Revert r206179 (by imp) and do something similar which is more consistent
  with all other corresponding CTF places by changing the corresponding
  code which is generated by config(8). Or in short, move the '@' from
  the variable definition to the use of the variable. [1]
  
  While I'm here break up a long line. [2]
  
  Discussed with:	imp [1,2], bde [2]

Modified:
  head/sys/conf/kern.pre.mk
  head/usr.sbin/config/mkmakefile.c

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Thu Apr 22 06:58:59 2010	(r207055)
+++ head/sys/conf/kern.pre.mk	Thu Apr 22 09:20:17 2010	(r207056)
@@ -128,7 +128,8 @@ NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${
 NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
 	  ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
 
-NORMAL_CTFCONVERT= @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+NORMAL_CTFCONVERT= [ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \
+		   ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 
 NORMAL_LINT=	${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
 

Modified: head/usr.sbin/config/mkmakefile.c
==============================================================================
--- head/usr.sbin/config/mkmakefile.c	Thu Apr 22 06:58:59 2010	(r207055)
+++ head/usr.sbin/config/mkmakefile.c	Thu Apr 22 09:20:17 2010	(r207056)
@@ -741,7 +741,7 @@ do_rules(FILE *f)
 				printf("config: don't know rules for %s\n", np);
 				break;
 			}
-			snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n.if defined(NORMAL_CTFCONVERT) && !empty(NORMAL_CTFCONVERT)\n\t${NORMAL_CTFCONVERT}\n.endif", ftype,
+			snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n\t@${NORMAL_CTFCONVERT}", ftype,
 			    toupper(och),
 			    ftp->f_flags & NOWERROR ? "_NOWERROR" : "");
 			compilewith = cmd;