diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 15 | ||||
| -rw-r--r-- | Makefile.in | 15 |
3 files changed, 21 insertions, 14 deletions
@@ -1,3 +1,7 @@ +2006-04-18 Martin Hunt <hunt@redhat.com> + + * Makefile.am (install-data-local): Another try. + 2006-04-18 Frank Ch. Eigler <fche@elastic.org> PR 2220 @@ -10,6 +14,7 @@ 2006-04-18 Martin Hunt <hunt@redhat.com> * Makefile.am (install-data-local): Tweak previous fix. + (install-data-local): 2006-04-18 Martin Hunt <hunt@redhat.com> diff --git a/Makefile.am b/Makefile.am index acd4467e..24645536 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,13 +73,14 @@ dist-hook: find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf install-data-local: - mkdir -p $(DESTDIR)$(pkgdatadir)/runtime/transport - tar -cf - --mode=644 $(srcdir)/runtime/*.[ch] | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -) - tar -cf - --mode=644 $(srcdir)/runtime/transport/*.[ch] | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -) - tar -cf - --mode=644 $(srcdir)/runtime/relayfs/*.[ch] $(srcdir)/runtime/relayfs/linux/*.h \ - | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -) - tar -cf - --mode=644 $(srcdir)/tapset/*.stp $(srcdir)/tapset/*/*.stp \ - | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -) +# mkdir -p $(DESTDIR)$(pkgdatadir)/runtime/transport $(DESTDIR)$(pkgdatadir)/runtime/relayfs $(DESTDIR)$(pkgdatadir)/tapset + (cd $(srcdir)/runtime; for f in *.[ch]; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/$$f; done) + (cd $(srcdir)/runtime/transport; for f in *.[ch]; \ + do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/transport/$$f; done) + (cd $(srcdir)/runtime/relayfs; find . -name '*.[ch]' -print \ + | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/relayfs/$$f; done) + (cd $(srcdir)/tapset; find . -name '*.stp' -print \ + | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) p=$(srcdir)/testsuite/parse s=$(srcdir)/testsuite/sem diff --git a/Makefile.in b/Makefile.in index 5b7db20e..5216321c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1089,13 +1089,14 @@ dist-hook: find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf install-data-local: - mkdir -p $(DESTDIR)$(pkgdatadir)/runtime/transport - tar -cf - --mode=644 $(srcdir)/runtime/*.[ch] | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -) - tar -cf - --mode=644 $(srcdir)/runtime/transport/*.[ch] | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -) - tar -cf - --mode=644 $(srcdir)/runtime/relayfs/*.[ch] $(srcdir)/runtime/relayfs/linux/*.h \ - | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -) - tar -cf - --mode=644 $(srcdir)/tapset/*.stp $(srcdir)/tapset/*/*.stp \ - | (cd $(DESTDIR)$(pkgdatadir) && tar xopf -) +# mkdir -p $(DESTDIR)$(pkgdatadir)/runtime/transport $(DESTDIR)$(pkgdatadir)/runtime/relayfs $(DESTDIR)$(pkgdatadir)/tapset + (cd $(srcdir)/runtime; for f in *.[ch]; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/$$f; done) + (cd $(srcdir)/runtime/transport; for f in *.[ch]; \ + do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/transport/$$f; done) + (cd $(srcdir)/runtime/relayfs; find . -name '*.[ch]' -print \ + | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/runtime/relayfs/$$f; done) + (cd $(srcdir)/tapset; find . -name '*.stp' -print \ + | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) gcov: @-$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check |