From 5ce37e1cef27059193ad75c35d752af85d1288e3 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Thu, 3 Jan 2008 17:23:42 +0000
Subject: Ensure that copyright is unique for rc, librc and libeinfo. Also, fix
 branding a little.

---
 src/Makefile   | 4 +++-
 src/libeinfo.c | 2 +-
 src/librc.c    | 2 +-
 src/rc.c       | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 5d78b501..01ecf9ba 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -100,7 +100,9 @@ all: .depend $(TARGET)
 
 version.h:
 	sed -n -e 's/^VERSION =[[:space:]]*\([^[:space:]]*\).*/#define VERSION "\1\"/p' ../Makefile > version.h
-	test -n "${BRANDING}" && echo "#define BRANDING \"${BRANDING}\"" >> version.h
+	if test -n "${BRANDING}"; then \
+		echo "#define BRANDING \"${BRANDING}\"" >> version.h; \
+	fi
 
 $(LIBEINFOOBJS):
 	$(CC) $(CPPFLAGS) $(CPPFLAGS_LIBEINFO) $(CFLAGS) -fPIC -c $<
diff --git a/src/libeinfo.c b/src/libeinfo.c
index 084bbba5..c5904865 100644
--- a/src/libeinfo.c
+++ b/src/libeinfo.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 
-const char copyright[] = "Copyright (c) 2007 Roy Marples";
+const char libeinfo_copyright[] = "Copyright (c) 2007 Roy Marples";
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/src/librc.c b/src/librc.c
index c891bdcc..8e0a62cb 100644
--- a/src/librc.c
+++ b/src/librc.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 
-const char copyright[] = "Copyright (c) 2007 Roy Marples";
+const char librc_copyright[] = "Copyright (c) 2007 Roy Marples";
 
 #include "librc.h"
 
diff --git a/src/rc.c b/src/rc.c
index ac462ff5..539f1167 100644
--- a/src/rc.c
+++ b/src/rc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-const char copyright[] = "Copyright (c) 2007 Roy Marples";
+const char rc_copyright[] = "Copyright (c) 2007 Roy Marples";
 
 #define SYSLOG_NAMES
 
-- 
cgit v1.2.3