From: Roy Marples <roy@marples.name>
Date: Mon, 19 Sep 2016 12:25:39 +0000 (+0000)
Subject: Fix building of embedded config with correct specified source.
X-Git-Tag: v6.11.4~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95aae80fea4bbf09985655ed4cb208eedb717670;p=thirdparty%2Fdhcpcd.git

Fix building of embedded config with correct specified source.
Update copyrights.
---

diff --git a/Makefile b/Makefile
index d7b5c31d..253678c1 100644
--- 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 fcaa6296..6599c3dc 100644
--- 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 5e5096e5..0645ee92 100644
--- 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 5bd7b6f6..27b58539 100755
--- 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' \