From f80d971c3b7add9517b15df7c62b38b45ba8643a Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Mon, 3 May 2010 14:40:36 -0500 Subject: [svn-r18694] Correct missing line (fi) in revision 18680 and remove incorrect code to install scripts to run examples. Correct code to install the scripts will be checked in later. Tested on amani and talwit using daily test shell. --- c++/examples/Makefile.in | 5 +---- config/examples.am | 5 +---- configure | 2 +- examples/Makefile.in | 5 +---- fortran/examples/Makefile.in | 5 +---- hl/c++/examples/Makefile.in | 5 +---- hl/examples/Makefile.in | 5 +---- hl/fortran/examples/Makefile.in | 5 +---- 8 files changed, 8 insertions(+), 29 deletions(-) diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 0e269d5..e839750 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -606,15 +606,12 @@ install-data-local: uninstall-local: @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples -install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT) +install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ fi; \ done - @if test $(TEST_SCRIPT) != X; then \ - (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. \ - || exit 1); uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ diff --git a/config/examples.am b/config/examples.am index f4d6f00..0d51251 100644 --- a/config/examples.am +++ b/config/examples.am @@ -60,15 +60,12 @@ install-data-local: uninstall-local: @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples -install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT) +install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ fi; \ done - @if test $(TEST_SCRIPT) != X; then \ - (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. \ - || exit 1); uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ diff --git a/configure b/configure index 5d13675..6d7bc6c 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 18658 2010-04-28 17:11:11Z acheng . +# From configure.in Id: configure.in 18688 2010-05-03 01:39:59Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for HDF5 1.8.4-snap21. # diff --git a/examples/Makefile.in b/examples/Makefile.in index f6d9774..8e98a97 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -636,15 +636,12 @@ install-data-local: uninstall-local: @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples -install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT) +install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ fi; \ done - @if test $(TEST_SCRIPT) != X; then \ - (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. \ - || exit 1); uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index f61ac9a..cb15bac 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -634,15 +634,12 @@ install-data-local: uninstall-local: @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples -install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT) +install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ fi; \ done - @if test $(TEST_SCRIPT) != X; then \ - (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. \ - || exit 1); uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 3bf06e7..cb8ed55 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -592,15 +592,12 @@ install-data-local: uninstall-local: @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples -install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT) +install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ fi; \ done - @if test $(TEST_SCRIPT) != X; then \ - (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. \ - || exit 1); uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 0067e60..f41d274 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -625,15 +625,12 @@ install-data-local: uninstall-local: @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples -install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT) +install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ fi; \ done - @if test $(TEST_SCRIPT) != X; then \ - (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. \ - || exit 1); uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 58e24a9..4da3eb5 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -593,15 +593,12 @@ install-data-local: uninstall-local: @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples -install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) $(TEST_SCRIPT) +install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ fi; \ done - @if test $(TEST_SCRIPT) != X; then \ - (set -x; $(INSTALL) $(builddir)/$(TEST_SCRIPT) $(EXAMPLEDIR)/.. \ - || exit 1); uninstall-examples: @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \ -- cgit v0.12