From owner-svn-src-head@FreeBSD.ORG  Thu Feb 12 00:17:15 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 69F5AEE2;
 Thu, 12 Feb 2015 00:17:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 54A732E1;
 Thu, 12 Feb 2015 00:17:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1C0HFuS011951;
 Thu, 12 Feb 2015 00:17:15 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1C0HF0b011950;
 Thu, 12 Feb 2015 00:17:15 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502120017.t1C0HF0b011950@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 12 Feb 2015 00:17:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278607 - head/usr.bin/svn/svn
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2015 00:17:15 -0000

Author: gjb
Date: Thu Feb 12 00:17:14 2015
New Revision: 278607
URL: https://svnweb.freebsd.org/changeset/base/278607

Log:
  Reduce number of lines to set ORGANIZATION_NAME in
  freebsd-organization.h.
  
  Patched by:	ian
  PR:		197540
  MFC after:	3 days
  X-MFC-with:	r278603
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/usr.bin/svn/svn/Makefile

Modified: head/usr.bin/svn/svn/Makefile
==============================================================================
--- head/usr.bin/svn/svn/Makefile	Wed Feb 11 23:30:46 2015	(r278606)
+++ head/usr.bin/svn/svn/Makefile	Thu Feb 12 00:17:14 2015	(r278607)
@@ -54,13 +54,8 @@ DPSRCS+=	freebsd-organization.h
 CLEANFILES+=	freebsd-organization.h
 CFLAGS+=	-I. -DHAS_ORGANIZATION_NAME
 freebsd-organization.h:
-	@echo '#define ORGANIZATION_NAME	${ORGANIZATION}' \
+	@echo "#define ORGANIZATION_NAME	\"$$(eval echo ${ORGANIZATION})\"" \
 	    > freebsd-organization.h
-	@# Remove quotes from ORGANIZATION_NAME if they exist.
-	@sed -i '' -e 's,",,g' freebsd-organization.h
-	@# Quote ORGANIZATION_NAME, in case it is two or more words.
-	@sed -i '' -E 's,	,	",' freebsd-organization.h
-	@sed -i '' -E 's,$$,",' freebsd-organization.h
 .endif
 
 svnlite.1: svn.1