summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-01-03 17:23:42 +0000
committerRoy Marples <roy@marples.name>2008-01-03 17:23:42 +0000
commit5ce37e1cef27059193ad75c35d752af85d1288e3 (patch)
treeefddfc676e976052d1055d4e796864ded558137d
parentf56929ea7da4a726f96bc7d91e953da6ea22d70d (diff)
downloadopenrc-5ce37e1cef27059193ad75c35d752af85d1288e3.tar.gz
openrc-5ce37e1cef27059193ad75c35d752af85d1288e3.tar.bz2
openrc-5ce37e1cef27059193ad75c35d752af85d1288e3.tar.xz
Ensure that copyright is unique for rc, librc and libeinfo. Also, fix branding a little.
-rw-r--r--src/Makefile4
-rw-r--r--src/libeinfo.c2
-rw-r--r--src/librc.c2
-rw-r--r--src/rc.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile
index 5d78b50..01ecf9b 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 084bbba..c590486 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 c891bdc..8e0a62c 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 ac462ff..539f116 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