Skip to content

Commit a23e9c8

Browse files
committed
Revert PR 154: DESTDIR is used for packing the library files
1 parent 94ed768 commit a23e9c8

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

examples/C/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ check_PROGRAMS = collective_write \
4444

4545
if INSTALL_EXAMPLES
4646
example_execbin_PROGRAMS = $(check_PROGRAMS)
47-
example_execbindir = $(DESTDIR)$(exec_prefix)/pnetcdf_examples/C
47+
example_execbindir = $(exec_prefix)/pnetcdf_examples/C
4848
example_execbin_SCRIPTS = run_c_examples.sh
4949
endif
5050

@@ -106,7 +106,7 @@ tests-local: all $(check_PROGRAMS)
106106

107107
install-exec-hook:
108108
@if test "x$(example_execbindir)" != x ; then \
109-
cp -f $(srcdir)/cdl_header.txt $(DESTDIR)$(example_execbindir) ; \
110-
$(SED_I) -e 's|check_PROGRAMS|$(check_PROGRAMS)|g ; s|TESTOUTDIR|$(TESTOUTDIR)|g ; s|TESTMPIRUN|$(TESTMPIRUN)|g ; s|SED_CMD|$(SED)|g ; s|ENABLE_BURST_BUFFER|$(ENABLE_BURST_BUFFER)|g ; s|ENABLE_NETCDF4|$(ENABLE_NETCDF4)|g' $(DESTDIR)$(example_execbindir)/run_c_examples.sh ; \
109+
cp -f $(srcdir)/cdl_header.txt $(DESTDIR)/$(example_execbindir) ; \
110+
$(SED_I) -e 's|check_PROGRAMS|$(check_PROGRAMS)|g ; s|TESTOUTDIR|$(TESTOUTDIR)|g ; s|TESTMPIRUN|$(TESTMPIRUN)|g ; s|SED_CMD|$(SED)|g ; s|ENABLE_BURST_BUFFER|$(ENABLE_BURST_BUFFER)|g ; s|ENABLE_NETCDF4|$(ENABLE_NETCDF4)|g' $(DESTDIR)/$(example_execbindir)/run_c_examples.sh ; \
111111
fi
112112

examples/CXX/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ check_PROGRAMS = collective_write \
3232

3333
if INSTALL_EXAMPLES
3434
example_execbin_PROGRAMS = $(check_PROGRAMS)
35-
example_execbindir = $(DESTDIR)$(exec_prefix)/pnetcdf_examples/CXX
35+
example_execbindir = $(exec_prefix)/pnetcdf_examples/CXX
3636
example_execbin_SCRIPTS = run_cxx_examples.sh
3737
endif
3838

@@ -86,7 +86,7 @@ tests-local: all $(check_PROGRAMS)
8686

8787
install-exec-hook:
8888
@if test "x$(example_execbindir)" != x ; then \
89-
$(SED_I) -e 's|check_PROGRAMS|$(check_PROGRAMS)|g ; s|TESTOUTDIR|$(TESTOUTDIR)|g ; s|TESTMPIRUN|$(TESTMPIRUN)|g ; s|SED_CMD|$(SED)|g ; s|ENABLE_BURST_BUFFER|$(ENABLE_BURST_BUFFER)|g ; s|ENABLE_NETCDF4|$(ENABLE_NETCDF4)|g' $(DESTDIR)$(example_execbindir)/run_cxx_examples.sh ; \
89+
$(SED_I) -e 's|check_PROGRAMS|$(check_PROGRAMS)|g ; s|TESTOUTDIR|$(TESTOUTDIR)|g ; s|TESTMPIRUN|$(TESTMPIRUN)|g ; s|SED_CMD|$(SED)|g ; s|ENABLE_BURST_BUFFER|$(ENABLE_BURST_BUFFER)|g ; s|ENABLE_NETCDF4|$(ENABLE_NETCDF4)|g' $(DESTDIR)/$(example_execbindir)/run_cxx_examples.sh ; \
9090
fi
9191

9292
.PHONY: ptest ptests ptest2 ptest3 ptest4 ptest6 ptest8 ptest10

examples/F77/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ check_PROGRAMS = nonblocking_write \
5252

5353
if INSTALL_EXAMPLES
5454
example_execbin_PROGRAMS = $(check_PROGRAMS)
55-
example_execbindir = $(DESTDIR)$(exec_prefix)/pnetcdf_examples/F77
55+
example_execbindir = $(exec_prefix)/pnetcdf_examples/F77
5656
example_execbin_SCRIPTS = run_f77_examples.sh
5757
endif
5858

@@ -111,7 +111,7 @@ tests-local: all $(check_PROGRAMS)
111111

112112
install-exec-hook:
113113
@if test "x$(example_execbindir)" != x ; then \
114-
$(SED_I) -e 's|check_PROGRAMS|$(check_PROGRAMS)|g ; s|TESTOUTDIR|$(TESTOUTDIR)|g ; s|TESTMPIRUN|$(TESTMPIRUN)|g ; s|SED_CMD|$(SED)|g ; s|ENABLE_BURST_BUFFER|$(ENABLE_BURST_BUFFER)|g ; s|ENABLE_NETCDF4|$(ENABLE_NETCDF4)|g' $(DESTDIR)$(example_execbindir)/run_f77_examples.sh ; \
114+
$(SED_I) -e 's|check_PROGRAMS|$(check_PROGRAMS)|g ; s|TESTOUTDIR|$(TESTOUTDIR)|g ; s|TESTMPIRUN|$(TESTMPIRUN)|g ; s|SED_CMD|$(SED)|g ; s|ENABLE_BURST_BUFFER|$(ENABLE_BURST_BUFFER)|g ; s|ENABLE_NETCDF4|$(ENABLE_NETCDF4)|g' $(DESTDIR)/$(example_execbindir)/run_f77_examples.sh ; \
115115
fi
116116

117117
.PHONY: ptest ptests ptest2 ptest3 ptest4 ptest6 ptest8 ptest10

examples/F90/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ check_PROGRAMS = nonblocking_write \
4141

4242
if INSTALL_EXAMPLES
4343
example_execbin_PROGRAMS = $(check_PROGRAMS)
44-
example_execbindir = $(DESTDIR)$(exec_prefix)/pnetcdf_examples/F90
44+
example_execbindir = $(exec_prefix)/pnetcdf_examples/F90
4545
example_execbin_SCRIPTS = run_f90_examples.sh
4646
endif
4747

@@ -100,7 +100,7 @@ tests-local: all $(check_PROGRAMS)
100100

101101
install-exec-hook:
102102
@if test "x$(example_execbindir)" != x ; then \
103-
$(SED_I) -e 's|check_PROGRAMS|$(check_PROGRAMS)|g ; s|TESTOUTDIR|$(TESTOUTDIR)|g ; s|TESTMPIRUN|$(TESTMPIRUN)|g ; s|SED_CMD|$(SED)|g ; s|ENABLE_BURST_BUFFER|$(ENABLE_BURST_BUFFER)|g ; s|ENABLE_NETCDF4|$(ENABLE_NETCDF4)|g' $(DESTDIR)$(example_execbindir)/run_f90_examples.sh ; \
103+
$(SED_I) -e 's|check_PROGRAMS|$(check_PROGRAMS)|g ; s|TESTOUTDIR|$(TESTOUTDIR)|g ; s|TESTMPIRUN|$(TESTMPIRUN)|g ; s|SED_CMD|$(SED)|g ; s|ENABLE_BURST_BUFFER|$(ENABLE_BURST_BUFFER)|g ; s|ENABLE_NETCDF4|$(ENABLE_NETCDF4)|g' $(DESTDIR)/$(example_execbindir)/run_f90_examples.sh ; \
104104
fi
105105

106106
.PHONY: ptest ptests ptest2 ptest3 ptest4 ptest6 ptest8 ptest10

0 commit comments

Comments
 (0)