From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 20 Apr 2015 11:26:22 +0000 (+0000)
Subject: [Bug 2804] install-local-data assumes GNU 'find' semantics'
X-Git-Tag: NTP_4_3_15~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75133340417876314765b933b0b6336bc150f6e9;p=thirdparty%2Fntp.git

[Bug 2804] install-local-data assumes GNU 'find' semantics'

bk: 5534e25eReZiSP3m98nCM0PfxqvhNQ
---

diff --git a/ChangeLog b/ChangeLog
index 301743c17..33f3a59d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
 
+* [Bug 2804] install-local-data assumes GNU 'find' semantics.
 * [Bug 2808] GPSD_JSON driver enhancements, step 1.
   Various improvements, see http://bugs.ntp.org/2808 for details.
   Changed libjsmn to a more recent version.
diff --git a/Makefile.am b/Makefile.am
index fc76719f0..a93b18bfe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,10 +113,12 @@ dist-hook:
 	@find $(distdir) -type d -name SCCS -print | xargs rm -rf
 
 install-data-local:
-	( cd $(srcdir) && find html -name SCCS -prune -o -type d \
-		-exec $(INSTALL) -d $(DESTDIR)$(htmldir)/{} ";" )
-	( cd $(srcdir) && find html -name SCCS -prune -o -type f \
-		-exec $(INSTALL_DATA) {} $(DESTDIR)$(htmldir)/{} ";" )
+	( cd $(srcdir) && \
+		for i in `find html -type d | grep -v SCCS` ; \
+		do $(INSTALL) -d $(DESTDIR)$(htmldir)/$$i ; done )
+	( cd $(srcdir) && \
+		for i in `find html -name SCCS -prune -o -type f` ; \
+		do $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)/$$i ; done )
 
 uninstall-local:
 		rm -rf $(DESTDIR)$(htmldir)/html