Fix building of embedded config with correct specified source.

Update copyrights.

diff --git a/Makefile b/Makefile
index d7b5c31d1b2723c93894aea04def08cfecf3bc12..253678c1270c4654556e2c07f168fc8ecdacba3d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ CLEANFILES+=  dhcpcd-embedded.h dhcpcd-embedded.c
 dhcpcd-embedded.h: genembedh ${DHCPCD_DEFS} dhcpcd-embedded.h.in
        ${HOST_SH} ${.ALLSRC} $^ > $@
 
-dhcpcd-embedded.c: genembedc ${DHCPCD_DEFS} dhcpcd-embedded.h
+dhcpcd-embedded.c: genembedc ${DHCPCD_DEFS} dhcpcd-embedded.c.in
        ${HOST_SH} ${.ALLSRC} $^ > $@
 
 if-options.c: dhcpcd-embedded.h

diff --git a/dhcpcd-embedded.c.in b/dhcpcd-embedded.c.in
index fcaa629657615edbfabbda0aa825413eca8983c6..6599c3dc07423529679a7f8dd5f52e9232f3e9b6 100644 (file)
--- a/dhcpcd-embedded.c.in
+++ b/dhcpcd-embedded.c.in
@@ -6,7 +6,7 @@
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2015 Roy Marples <roy@marples.name>
+ * Copyright (c) 2006-2016 Roy Marples <roy@marples.name>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without

diff --git a/dhcpcd-embedded.h.in b/dhcpcd-embedded.h.in
index 5e5096e59e24f8edc7622d23d3734e85e446cb13..0645ee92467d4132e3789be266c9e2e13eb27ef1 100644 (file)
--- a/dhcpcd-embedded.h.in
+++ b/dhcpcd-embedded.h.in
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2015 Roy Marples <roy@marples.name>
+ * Copyright (c) 2006-2016 Roy Marples <roy@marples.name>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without

diff --git a/genembedc b/genembedc
index 5bd7b6f6def09318b5d39c393ed087d3cf2a898c..27b585399453b4fc2153f056cd82e2bd1344d531 100755 (executable)
--- a/genembedc
+++ b/genembedc
@@ -1,10 +1,12 @@
 #!/bin/sh
 set -e
 
+: ${TOOL_CAT:=cat}
 : ${TOOL_SED:=sed}
 CONF=${1:-dhcpcd-definitions.conf}
+C=${2:-dhcpcd-embedded.c.in}
 
-cat dhcpcd-embedded.c.in
+$TOOL_CAT $C
 $TOOL_SED \
        -e 's/#.*$//' \
        -e '/^$/d' \