44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
Fix test environment.
|
|
|
|
--- a/octave/Makefile.am
|
|
+++ b/octave/Makefile.am
|
|
@@ -5,5 +5,5 @@
|
|
lhapdf.oct: wrapoctave.cc
|
|
$(MKOCTFILE) -I$(top_srcdir)/include -v -g -o lhapdf.oct wrapoctave.cc -L$(top_builddir)/lib -L$(top_builddir)/lib/.libs -lLHAPDF
|
|
|
|
-TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets $(OCTAVE)
|
|
+TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets LD_LIBRARY_PATH="$(top_builddir)/lib/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" $(OCTAVE)
|
|
TESTS = $(srcdir)/lhapdf-octave-example1.m
|
|
--- a/octave/Makefile.in
|
|
+++ b/octave/Makefile.in
|
|
@@ -195,7 +195,7 @@
|
|
top_srcdir = @top_srcdir@
|
|
EXTRA_DIST = lhapdf-octave-example1.m wrapoctave.cc
|
|
pkgdata_DATA = lhapdf.oct
|
|
-TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets $(OCTAVE)
|
|
+TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets LD_LIBRARY_PATH="$(top_builddir)/lib/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" $(OCTAVE)
|
|
TESTS = $(srcdir)/lhapdf-octave-example1.m
|
|
all: all-am
|
|
|
|
--- a/examples/Makefile.am
|
|
+++ b/examples/Makefile.am
|
|
@@ -12,7 +12,7 @@
|
|
lhapdf_example9_SOURCES = Example9.f
|
|
lhapdf_example10_SOURCES = Example10.f
|
|
|
|
-#TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets
|
|
+TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets
|
|
TESTS = lhapdf-example1
|
|
# lhapdf-example2 lhapdf-example3
|
|
|
|
diff -ur lhapdf-5.8.8.orig/examples/Makefile.in lhapdf-5.8.8/examples/Makefile.in
|
|
--- a/examples/Makefile.in
|
|
+++ b/examples/Makefile.in
|
|
@@ -37,6 +37,7 @@
|
|
lhapdf-example8$(EXEEXT) lhapdf-example9$(EXEEXT) \
|
|
lhapdf-example10$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
|
|
TESTS = lhapdf-example1$(EXEEXT) $(am__EXEEXT_3) $(am__EXEEXT_4)
|
|
+TESTS_ENVIRONMENT = LHAPATH=$(top_srcdir)/PDFsets
|
|
@ENABLE_LHAGLUE_TRUE@am__append_1 = lhapdf-example4 lhapdf-example5 lhapdf-example6
|
|
@ENABLE_LHAGLUE_TRUE@am__append_2 = lhapdf-example4
|
|
@ENABLE_CCWRAP_TRUE@am__append_3 = lhapdf-cctest1 lhapdf-cctest2 lhapdf-cctest3 lhapdf-cctest4 lhapdf-cctest5
|