From owner-svn-src-stable-10@FreeBSD.ORG  Sat Feb 14 01:33:12 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 41DAE46B;
 Sat, 14 Feb 2015 01:33:12 +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 2CAAE926;
 Sat, 14 Feb 2015 01:33:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1E1XCHx023369;
 Sat, 14 Feb 2015 01:33:12 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1E1XCMf023368;
 Sat, 14 Feb 2015 01:33:12 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502140133.t1E1XCMf023368@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: Sat, 14 Feb 2015 01:33:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r278740 - stable/10/usr.bin/svn/svn
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2015 01:33:12 -0000

Author: gjb
Date: Sat Feb 14 01:33:11 2015
New Revision: 278740
URL: https://svnweb.freebsd.org/changeset/base/278740

Log:
  MFC r278603, r278607:
  
   r278603:
     Ensure ORGANIZATION_NAME is quoted when ORGANIZATION
     could contain strings of two or more words.
  
   r278607:
     Reduce number of lines to set ORGANIZATION_NAME in
     freebsd-organization.h.
  
  PR: 		197540
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.bin/svn/svn/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/svn/svn/Makefile
==============================================================================
--- stable/10/usr.bin/svn/svn/Makefile	Sat Feb 14 00:23:53 2015	(r278739)
+++ stable/10/usr.bin/svn/svn/Makefile	Sat Feb 14 01:33:11 2015	(r278740)
@@ -59,7 +59,7 @@ 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
 .endif