summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2015-02-11 22:59:24 +0000
committergjb <gjb@FreeBSD.org>2015-02-11 22:59:24 +0000
commit34ff9bcd54998bbb7d38578c32136f1caf76b32b (patch)
tree66a10d9d39b57026a5864341d00032395873b245
parent778a613385d4d693e0f957d07e5ba5f995795500 (diff)
downloadFreeBSD-src-34ff9bcd54998bbb7d38578c32136f1caf76b32b.zip
FreeBSD-src-34ff9bcd54998bbb7d38578c32136f1caf76b32b.tar.gz
Ensure ORGANIZATION_NAME is quoted when ORGANIZATION
could contain strings of two or more words. Reviewed by: peter Reported by: karl@denninger.net PR: 197540 MFC after: 3 days Sponsored by: The FreeBSD Foundation
-rw-r--r--usr.bin/svn/svn/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile
index cdac81d..30307be 100644
--- a/usr.bin/svn/svn/Makefile
+++ b/usr.bin/svn/svn/Makefile
@@ -54,8 +54,13 @@ 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 ${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
OpenPOWER on IntegriCloud