From: Roy Marples <roy@marples.name>
Date: Fri, 7 Nov 2014 20:56:47 +0000 (+0000)
Subject: Remove RCSIDs from dhcpcd, they belong in the upstream project only.
X-Git-Tag: v6.6.2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68c8a3cf6f069490663c64967a5221fa3d769c3a;p=thirdparty%2Fdhcpcd.git

Remove RCSIDs from dhcpcd, they belong in the upstream project only.
---

diff --git a/Makefile b/Makefile
index 3b6e256d..5f2c45ee 100644
--- a/Makefile
+++ b/Makefile
@@ -168,67 +168,6 @@ import: ${SRCS}
 			tr ' ' '\n' | \
 			sort -u) /tmp/${DISTPREFIX}/compat; \
 	fi;
-	if test -n "${IMPORT_RCSID}"; then \
-		for x in \
-		    /tmp/${DISTPREFIX}/*.c \
-		    /tmp/${DISTPREFIX}/crypt/*.c \
-		    /tmp/${DISTPREFIX}/compat/*.c \
-		; do \
-			if test -e "$$x"; then \
-				printf "${IMPORT_RCSID}\n\n" >"$$x".new; \
-				cat "$$x" >>"$$x".new; \
-				mv "$$x".new "$$x"; \
-			fi; \
-		done; \
-	fi;
-	if test -n "${IMPORT_HID}"; then \
-		for x in \
-		    /tmp/${DISTPREFIX}/*.h \
-		    /tmp/${DISTPREFIX}/crypt/*.h \
-		    /tmp/${DISTPREFIX}/compat/*.h \
-		; do \
-			if test -e "$$x"; then \
-				printf "${IMPORT_HID}\n\n" >"$$x".new; \
-				cat "$$x" >>"$$x".new; \
-				mv "$$x".new "$$x"; \
-			fi; \
-		done; \
-	fi;
-	if test -n "${IMPORT_MANID}"; then \
-		for x in \
-		    /tmp/${DISTPREFIX}/dhcpcd.8.in \
-		    /tmp/${DISTPREFIX}/dhcpcd-run-hooks.8.in \
-		    /tmp/${DISTPREFIX}/dhcpcd.conf.5.in \
-		; do \
-			if test -e "$$x"; then \
-				printf "${IMPORT_MANID}\n" >"$$x".new; \
-				cat "$$x" >>"$$x".new; \
-				mv "$$x".new "$$x"; \
-			fi; \
-		done; \
-	fi;
-	if test -n "${IMPORT_SHID}"; then \
-		for x in \
-		    /tmp/${DISTPREFIX}/dhcpcd-run-hooks.in \
-		    /tmp/${DISTPREFIX}/dhcpcd.conf \
-		    /tmp/${DISTPREFIX}/dhcpcd-definitions.conf \
-		; do \
-			if test -e "$$x"; then \
-				if test "$$(sed -ne 1p $$x)" = "#!/bin/sh" \
-				; then \
-					echo "#!/bin/sh" > "$$x".new; \
-					printf "${IMPORT_SHID}\n" >>"$$x".new; \
-					echo "" >>"$$x".new; \
-					sed 1d "$$x" >>"$$x".new; \
-				else \
-					printf "${IMPORT_SHID}\n" >>"$$x".new; \
-					echo "" >>"$$x".new; \
-					cat "$$x" >>"$$x".new; \
-				fi; \
-				mv "$$x".new "$$x"; \
-			fi; \
-		done; \
-	fi;
 	cd dhcpcd-hooks; ${MAKE} DISTPREFIX=${DISTPREFIX} $@
 
 include Makefile.inc
diff --git a/configure b/configure
index 25714c09..b64d0725 100755
--- a/configure
+++ b/configure
@@ -1131,20 +1131,6 @@ if cd dhcpcd-hooks; then
 fi
 echo "HOOKSCRIPTS=	$HOOKS" >>$CONFIG_MK
 
-# Define any RCSIDs for import into 3rd party systems
-case "$OS" in
-netbsd)
-	echo "IMPORT_RCSID=	\#include <sys/cdefs.h>\\n" >>$CONFIG_MK
-	echo "IMPORT_RCSID+=	__RCSID(\\\"\\\$\$NetBSD: \\\$\$\\\");" >> \
-	    $CONFIG_MK
-	echo "IMPORT_HID+=	/* \\\$\$NetBSD: \\\$\$ */" >> \
-	    $CONFIG_MK
-	echo "IMPORT_MANID=	.\\\\\\\\\\\"     \\\$\$NetBSD: \$\$ " >> \
-	    $CONFIG_MK
-	echo "IMPORT_SHID=	\# \\\$\$NetBSD: \$\$ " >>$CONFIG_MK
-	;;
-esac
-
 echo
 echo "   SYSCONFDIR =		$SYSCONFDIR"
 echo "   SBINDIR =		$SBINDIR"
diff --git a/dhcpcd-hooks/Makefile b/dhcpcd-hooks/Makefile
index e5b7794b..63285090 100644
--- a/dhcpcd-hooks/Makefile
+++ b/dhcpcd-hooks/Makefile
@@ -19,7 +19,7 @@ all: ${HOOKSCRIPTS}
 clean:
 	rm -f 50-ypbind
 
-proginstall:
+proginstall: ${HOOKSCRIPTS}
 	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR}
 	${INSTALL} -m ${NONBINMODE} ${SCRIPTS} ${DESTDIR}${SCRIPTSDIR}
 
@@ -27,16 +27,4 @@ install: proginstall
 
 import: ${HOOKSCRIPTS}
 	${INSTALL} -d /tmp/${DISTPREFIX}/dhcpcd-hooks
-	for x in ${SCRIPTS}; do \
-		t="/tmp/${DISTPREFIX}/dhcpcd-hooks/$$x"; \
-		if test "$$(sed -ne 1p $$x)" = "#!/bin/sh"; then \
-			echo "#!/bin/sh" >"$$t"; \
-			printf "${IMPORT_SHID}\n" >>"$$t"; \
-			echo "" >>"$$t"; \
-			sed 1d "$$x" >>"$$t"; \
-		else \
-			printf "${IMPORT_SHID}\n" >"$$t"; \
-			echo "" >>"$$t"; \
-			cat "$$x" >>"$$t"; \
-		fi; \
-	done;
+	${INSTALL} -m ${NONBINMODE} ${SCRIPTS} /tmp/${DISTPREFIX}/dhcpcd-hooks