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

bk: 5534e25eReZiSP3m98nCM0PfxqvhNQ

diff --git a/ChangeLog b/ChangeLog
index 301743c17a5ea0da5290276d9727d985fc32fb9b..33f3a59d6d5066bc91513d25cad81ae314a59b32 100644 (file)
--- 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 fc76719f04289b9058884144f9ef63ac35951d8c..a93b18bfe7203110c45b15e91db06d2f916bbeea 100644 (file)
--- 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