svn commit: r278607 - head/usr.bin/svn/svn

[Glen Barber]

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