Update README, add cbflib.ini both for tests and after install -- HJB

yayahjb · Dec 4, 2018 · 8c0df04 · 8c0df04
1 parent 1c56acb
commit 8c0df04
Show file tree

Hide file tree

Showing 17 changed files with 319 additions and 118 deletions.
diff --git a/Makefile b/Makefile
@@ -580,6 +580,7 @@ SOCFLAGS = -fPIC
 SOLDFLAGS = -shared -Wl,-rpath,$(CBF_PREFIX)/lib
 JAVAINCLUDES = -I$(JDKDIR)/include -I$(JDKDIR)/include/linux
 LDPREFIX = LD_LIBRARY_PATH=$(SOLIB):$$LD_LIBRARY_PATH;export LD_LIBRARY_PATH;
+RUNLDPREFIX = LD_LIBRARY_PATH=$(CBF_PREFIX)/LIB:$$LD_LIBRARY_PATH;export LD_LIBRARY_PATH;
 EXTRALIBS = -lm
 M4FLAGS = -Dfcb_bytes_in_rec=131072
 TIME = time
@@ -1028,6 +1029,11 @@ Makefile: $(M4)/Makefile.m4
 	m4 -P $(PYCIFRWDEF) -Dcbf_system=default $(M4)/Makefile.m4 > Makefile.tmp
 	mv Makefile.tmp Makefile 
 
+cbflib.ini: $(M4)/Makefile.m4
+	echo  "$(LDPREFIX)" > cbflib.ini
+	echo  "HDF5_PLUGIN_PATH=$(SOLIB):$$HDF5_PLUGIN_PATH" >> cbflib.ini
+	echo  "export HDF5_PLUGIN_PATH" >> cbflib.ini
+
 symlinksdone:
 	chmod a+x .symlinks
 	chmod a+x .undosymlinks
@@ -1073,6 +1079,10 @@ baseinstall:  all $(CBF_PREFIX) $(CBF_PREFIX)/lib $(CBF_PREFIX)/bin \
 	-cp $(CBF_PREFIX)/lib/libfcb.so $(CBF_PREFIX)/lib/libfcb_old.so
 	cp $(SOLIB)/libfcb.so $(CBF_PREFIX)/lib/libfcb.so
 	$(LN) $(CBF_PREFIX)/lib/libfcb.so $(CBF_PREFIX)/lib/lib_fcb.so
+	-cp $(CBF_PREFIX)/bin/cbflib.ini $(CBF_PREFIX)/bin/cbflib.ini_old
+	echo  "$(RUNLDPREFIX)" > $(CBF_PREFIX)/bin/cbflib.ini
+	echo  "HDF5_PLUGIN_PATH=$(CBF_PREFIX)/lib:$$HDF5_PLUGIN_PATH" >> $(CBF_PREFIX)/bin/cbflib.ini
+	echo  "export HDF5_PLUGIN_PATH" >> $(CBF_PREFIX)/bin/cbflib.ini
 	-cp $(CBF_PREFIX)/bin/adscimg2cbf $(CBF_PREFIX)/bin/adscimg2cbf_old
 	cp $(BIN)/adscimg2cbf $(CBF_PREFIX)/bin/adscimg2cbf
 	-cp $(CBF_PREFIX)/bin/cbf2adscimg $(CBF_PREFIX)/bin/cbf2adscimg_old
@@ -1236,7 +1246,7 @@ $(TIFF):	build_tiff config.guess config.sub
 $(TIFF)_INSTALL:    $(TIFF)
 	-rm -rf $(TIFF)_install
 	rsync -avz $(TIFF)/  $(TIFF)_install
-	(cd $(TIFF_install); make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
+	(cd $(TIFF)_install; make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
 
 
 ifneq ($(CBFLIB_DONT_USE_LOCAL_HDF5),yes)
@@ -2071,7 +2081,7 @@ restore_output:		$(NEWTESTOUTPUT) $(DATADIRO) $(MINICBF_TEST)/minicbf.h5
 	cp test_fcb_read_testflatpackedout.out $(DATADIRO)/test_fcb_read_testflatpackedout_orig.out
 	cp XRD1621.cbf $(DATADIRO)/XRD1621_orig.cbf
 	cp XRD1621_I4encbC100.cbf $(DATADIRO)/XRD1621_I4encbC100_orig.cbf
-	cp minicbf_orig.h5 $(DATADIRO)/minicbf_orig.h5
+	cp $(MINICBF_TEST)/minicbf.h5 $(DATADIRO)/minicbf_orig.h5
 
 restore_sigs_only:	$(NEWTESTOUTPUT) $(DATADIRS)
 	$(SIGNATURE) < adscconverted_flat.cbf > $(DATADIRS)/adscconverted_flat_orig.cbf$(SEXT)
@@ -2089,7 +2099,7 @@ restore_sigs_only:	$(NEWTESTOUTPUT) $(DATADIRS)
 	$(SIGNATURE) < test_fcb_read_testflatpackedout.out > $(DATADIRS)/test_fcb_read_testflatpackedout_orig.out$(SEXT)
 	$(SIGNATURE) < XRD1621.cbf > $(DATADIRS)/XRD1621_orig.cbf$(SEXT)
 	$(SIGNATURE) < XRD1621_I4encbC100.cbf > $(DATADIRS)/XRD1621_I4encbC100_orig.cbf$(SEXT)
-	$(SIGNATURE) < minicbf_orig.h5 > $(DATADIRS)/minicbf_orig.h5$(SEXT)
+	$(SIGNATURE) < $(MINICBF_TEST)/minicbf.h5 > $(DATADIRS)/minicbf_orig.h5$(SEXT)
 restore_signatures:	restore_output restore_sigs_only
 
 #
@@ -2241,7 +2251,7 @@ endif
 	$(TIME) $(BIN)/cif2cbf -5 rn $(HDF5REGISTER) -en -cp -i insulin_pilatus6mconverted_enc2.cbf.h5 -o insulin_pilatus6mconverted_enc2.cbf.h5.cbf; \
 	 $(BIN)/cif2cbf  -eq -cI -i insulin_pilatus6mconverted_enc2.cbf.h5.cbf -o insulin_pilatus6mconverted_enc2.cbf.h5.eqcI.cbf)
 	-cmp insulin_pilatus6mconverted_enc2.cbf.h5.eqcI.cbf insulin_pilatus6mconverted_orig.cbf.h5.eqcI.cbf
-	#-rm -f insulin_pilatus6mconverted*.cbf.h5.eqcI.cbf
+	-rm -f insulin_pilatus6mconverted*.cbf.h5.eqcI.cbf
 	$(LDPREFIX)  $(TINE) $(BIN)/test_cbf_airy_disk
 	$(LDPREFIX)  $(TIME) $(BIN)/cbf_testxfelread
 	$(LDPREFIX)  $(TIME) $(BIN)/testalloc
@@ -2256,7 +2266,7 @@ endif
 	-cd $(MINICBF_TEST); $(DIFF) minicbf_original.dump minicbf.dump
 	$(LDPREFIX) cd $(MINICBF_TEST); rm -f minicbf_original.dump
 	$(LDPREFIX) cd $(MINICBF_TEST); rm -f minicbf.dump
-	cd $(MINICBF_TEST); rm -f minicbf.h5
+	#cd $(MINICBF_TEST); rm -f minicbf.h5
 	$(LDPREFIX) cd $(MINICBF_TEST); $(TIME) $(BIN)/cbf2nexus -c zlib \
 	--list -o i19-1.h5 ../1191_00005.cbf
 	$(LDPREFIX) cd $(MINICBF_TEST); $(TIME) $(BIN)/nexus2cbf \

diff --git a/Makefile_AIX b/Makefile_AIX
@@ -577,6 +577,7 @@ F90FLAGS = -g -qsuffix=f=f90
 F90LDFLAGS = 
 M4FLAGS = -Dfcb_bytes_in_rec=131072
 LDPREFIX = LIBPATH=$(SOLIB):$$LIBPATH;export LIBPATH;
+RUNLDPREFIX = LIBPATH=$(CBF_PREFIX)/lib:$$LIBPATH;export LIBPATH;
 EXTRALIBS = -lm
 TIME = time
 
@@ -1024,6 +1025,11 @@ Makefile: $(M4)/Makefile.m4
 	m4 -P $(PYCIFRWDEF) -Dcbf_system=default $(M4)/Makefile.m4 > Makefile.tmp
 	mv Makefile.tmp Makefile 
 
+cbflib.ini: $(M4)/Makefile.m4
+	echo  "$(LDPREFIX)" > cbflib.ini
+	echo  "HDF5_PLUGIN_PATH=$(SOLIB):$$HDF5_PLUGIN_PATH" >> cbflib.ini
+	echo  "export HDF5_PLUGIN_PATH" >> cbflib.ini
+
 symlinksdone:
 	chmod a+x .symlinks
 	chmod a+x .undosymlinks
@@ -1069,6 +1075,10 @@ baseinstall:  all $(CBF_PREFIX) $(CBF_PREFIX)/lib $(CBF_PREFIX)/bin \
 	-cp $(CBF_PREFIX)/lib/libfcb.so $(CBF_PREFIX)/lib/libfcb_old.so
 	cp $(SOLIB)/libfcb.so $(CBF_PREFIX)/lib/libfcb.so
 	$(LN) $(CBF_PREFIX)/lib/libfcb.so $(CBF_PREFIX)/lib/lib_fcb.so
+	-cp $(CBF_PREFIX)/bin/cbflib.ini $(CBF_PREFIX)/bin/cbflib.ini_old
+	echo  "$(RUNLDPREFIX)" > $(CBF_PREFIX)/bin/cbflib.ini
+	echo  "HDF5_PLUGIN_PATH=$(CBF_PREFIX)/lib:$$HDF5_PLUGIN_PATH" >> $(CBF_PREFIX)/bin/cbflib.ini
+	echo  "export HDF5_PLUGIN_PATH" >> $(CBF_PREFIX)/bin/cbflib.ini
 	-cp $(CBF_PREFIX)/bin/adscimg2cbf $(CBF_PREFIX)/bin/adscimg2cbf_old
 	cp $(BIN)/adscimg2cbf $(CBF_PREFIX)/bin/adscimg2cbf
 	-cp $(CBF_PREFIX)/bin/cbf2adscimg $(CBF_PREFIX)/bin/cbf2adscimg_old
@@ -1232,7 +1242,7 @@ $(TIFF):	build_tiff config.guess config.sub
 $(TIFF)_INSTALL:    $(TIFF)
 	-rm -rf $(TIFF)_install
 	rsync -avz $(TIFF)/  $(TIFF)_install
-	(cd $(TIFF_install); make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
+	(cd $(TIFF)_install; make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
 
 
 ifneq ($(CBFLIB_DONT_USE_LOCAL_HDF5),yes)
@@ -2067,7 +2077,7 @@ restore_output:		$(NEWTESTOUTPUT) $(DATADIRO) $(MINICBF_TEST)/minicbf.h5
 	cp test_fcb_read_testflatpackedout.out $(DATADIRO)/test_fcb_read_testflatpackedout_orig.out
 	cp XRD1621.cbf $(DATADIRO)/XRD1621_orig.cbf
 	cp XRD1621_I4encbC100.cbf $(DATADIRO)/XRD1621_I4encbC100_orig.cbf
-	cp minicbf_orig.h5 $(DATADIRO)/minicbf_orig.h5
+	cp $(MINICBF_TEST)/minicbf.h5 $(DATADIRO)/minicbf_orig.h5
 
 restore_sigs_only:	$(NEWTESTOUTPUT) $(DATADIRS)
 	$(SIGNATURE) < adscconverted_flat.cbf > $(DATADIRS)/adscconverted_flat_orig.cbf$(SEXT)
@@ -2085,7 +2095,7 @@ restore_sigs_only:	$(NEWTESTOUTPUT) $(DATADIRS)
 	$(SIGNATURE) < test_fcb_read_testflatpackedout.out > $(DATADIRS)/test_fcb_read_testflatpackedout_orig.out$(SEXT)
 	$(SIGNATURE) < XRD1621.cbf > $(DATADIRS)/XRD1621_orig.cbf$(SEXT)
 	$(SIGNATURE) < XRD1621_I4encbC100.cbf > $(DATADIRS)/XRD1621_I4encbC100_orig.cbf$(SEXT)
-	$(SIGNATURE) < minicbf_orig.h5 > $(DATADIRS)/minicbf_orig.h5$(SEXT)
+	$(SIGNATURE) < $(MINICBF_TEST)/minicbf.h5 > $(DATADIRS)/minicbf_orig.h5$(SEXT)
 restore_signatures:	restore_output restore_sigs_only
 
 #
@@ -2252,7 +2262,7 @@ endif
 	-cd $(MINICBF_TEST); $(DIFF) minicbf_original.dump minicbf.dump
 	$(LDPREFIX) cd $(MINICBF_TEST); rm -f minicbf_original.dump
 	$(LDPREFIX) cd $(MINICBF_TEST); rm -f minicbf.dump
-	cd $(MINICBF_TEST); rm -f minicbf.h5
+	#cd $(MINICBF_TEST); rm -f minicbf.h5
 	$(LDPREFIX) cd $(MINICBF_TEST); $(TIME) $(BIN)/cbf2nexus -c zlib \
 	--list -o i19-1.h5 ../1191_00005.cbf
 	$(LDPREFIX) cd $(MINICBF_TEST); $(TIME) $(BIN)/nexus2cbf \

diff --git a/Makefile_IRIX_gcc b/Makefile_IRIX_gcc
@@ -578,6 +578,9 @@ LDFLAGS =
 F90C    =
 F90FLAGS =
 M4FLAGS = -Dfcb_bytes_in_rec=4096
+JAVAINCLUDES = -I$(JDKDIR)/include -I$(JDKDIR)/include/linux
+LDPREFIX = LD_LIBRARY_PATH=$(SOLIB):$$LD_LIBRARY_PATH;export LD_LIBRARY_PATH;
+RUNLDPREFIX = LD_LIBRARY_PATH=$(CBF_PREFIX)/LIB:$$LD_LIBRARY_PATH;export LD_LIBRARY_PATH;
 EXTRALIBS = -lm
 TIME    =
 SHAR    = shar
@@ -1028,6 +1031,11 @@ Makefile: $(M4)/Makefile.m4
 	m4 -P $(PYCIFRWDEF) -Dcbf_system=default $(M4)/Makefile.m4 > Makefile.tmp
 	mv Makefile.tmp Makefile 
 
+cbflib.ini: $(M4)/Makefile.m4
+	echo  "$(LDPREFIX)" > cbflib.ini
+	echo  "HDF5_PLUGIN_PATH=$(SOLIB):$$HDF5_PLUGIN_PATH" >> cbflib.ini
+	echo  "export HDF5_PLUGIN_PATH" >> cbflib.ini
+
 symlinksdone:
 	chmod a+x .symlinks
 	chmod a+x .undosymlinks
@@ -1073,6 +1081,10 @@ baseinstall:  all $(CBF_PREFIX) $(CBF_PREFIX)/lib $(CBF_PREFIX)/bin \
 	-cp $(CBF_PREFIX)/lib/libfcb.so $(CBF_PREFIX)/lib/libfcb_old.so
 	cp $(SOLIB)/libfcb.so $(CBF_PREFIX)/lib/libfcb.so
 	$(LN) $(CBF_PREFIX)/lib/libfcb.so $(CBF_PREFIX)/lib/lib_fcb.so
+	-cp $(CBF_PREFIX)/bin/cbflib.ini $(CBF_PREFIX)/bin/cbflib.ini_old
+	echo  "$(RUNLDPREFIX)" > $(CBF_PREFIX)/bin/cbflib.ini
+	echo  "HDF5_PLUGIN_PATH=$(CBF_PREFIX)/lib:$$HDF5_PLUGIN_PATH" >> $(CBF_PREFIX)/bin/cbflib.ini
+	echo  "export HDF5_PLUGIN_PATH" >> $(CBF_PREFIX)/bin/cbflib.ini
 	-cp $(CBF_PREFIX)/bin/adscimg2cbf $(CBF_PREFIX)/bin/adscimg2cbf_old
 	cp $(BIN)/adscimg2cbf $(CBF_PREFIX)/bin/adscimg2cbf
 	-cp $(CBF_PREFIX)/bin/cbf2adscimg $(CBF_PREFIX)/bin/cbf2adscimg_old
@@ -1236,7 +1248,7 @@ $(TIFF):	build_tiff config.guess config.sub
 $(TIFF)_INSTALL:    $(TIFF)
 	-rm -rf $(TIFF)_install
 	rsync -avz $(TIFF)/  $(TIFF)_install
-	(cd $(TIFF_install); make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
+	(cd $(TIFF)_install; make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
 
 
 ifneq ($(CBFLIB_DONT_USE_LOCAL_HDF5),yes)
@@ -2071,7 +2083,7 @@ restore_output:		$(NEWTESTOUTPUT) $(DATADIRO) $(MINICBF_TEST)/minicbf.h5
 	cp test_fcb_read_testflatpackedout.out $(DATADIRO)/test_fcb_read_testflatpackedout_orig.out
 	cp XRD1621.cbf $(DATADIRO)/XRD1621_orig.cbf
 	cp XRD1621_I4encbC100.cbf $(DATADIRO)/XRD1621_I4encbC100_orig.cbf
-	cp minicbf_orig.h5 $(DATADIRO)/minicbf_orig.h5
+	cp $(MINICBF_TEST)/minicbf.h5 $(DATADIRO)/minicbf_orig.h5
 
 restore_sigs_only:	$(NEWTESTOUTPUT) $(DATADIRS)
 	$(SIGNATURE) < adscconverted_flat.cbf > $(DATADIRS)/adscconverted_flat_orig.cbf$(SEXT)
@@ -2089,7 +2101,7 @@ restore_sigs_only:	$(NEWTESTOUTPUT) $(DATADIRS)
 	$(SIGNATURE) < test_fcb_read_testflatpackedout.out > $(DATADIRS)/test_fcb_read_testflatpackedout_orig.out$(SEXT)
 	$(SIGNATURE) < XRD1621.cbf > $(DATADIRS)/XRD1621_orig.cbf$(SEXT)
 	$(SIGNATURE) < XRD1621_I4encbC100.cbf > $(DATADIRS)/XRD1621_I4encbC100_orig.cbf$(SEXT)
-	$(SIGNATURE) < minicbf_orig.h5 > $(DATADIRS)/minicbf_orig.h5$(SEXT)
+	$(SIGNATURE) < $(MINICBF_TEST)/minicbf.h5 > $(DATADIRS)/minicbf_orig.h5$(SEXT)
 restore_signatures:	restore_output restore_sigs_only
 
 #
@@ -2256,7 +2268,7 @@ endif
 	-cd $(MINICBF_TEST); $(DIFF) minicbf_original.dump minicbf.dump
 	$(LDPREFIX) cd $(MINICBF_TEST); rm -f minicbf_original.dump
 	$(LDPREFIX) cd $(MINICBF_TEST); rm -f minicbf.dump
-	cd $(MINICBF_TEST); rm -f minicbf.h5
+	#cd $(MINICBF_TEST); rm -f minicbf.h5
 	$(LDPREFIX) cd $(MINICBF_TEST); $(TIME) $(BIN)/cbf2nexus -c zlib \
 	--list -o i19-1.h5 ../1191_00005.cbf
 	$(LDPREFIX) cd $(MINICBF_TEST); $(TIME) $(BIN)/nexus2cbf \

diff --git a/Makefile_LINUX b/Makefile_LINUX
@@ -579,6 +579,7 @@ SOCFLAGS = -fPIC
 SOLDFLAGS = -shared -Wl,-rpath,$(CBF_PREFIX)/lib
 JAVAINCLUDES = -I$(JDKDIR)/include -I$(JDKDIR)/include/linux
 LDPREFIX = LD_LIBRARY_PATH=$(SOLIB):$$LD_LIBRARY_PATH;export LD_LIBRARY_PATH;
+RUNLDPREFIX = LD_LIBRARY_PATH=$(CBF_PREFIX)/lib:$$LD_LIBRARY_PATH;export LD_LIBRARY_PATH;
 EXTRALIBS = -lm
 M4FLAGS = -Dfcb_bytes_in_rec=131072
 TIME = time
@@ -1027,6 +1028,11 @@ Makefile: $(M4)/Makefile.m4
 	m4 -P $(PYCIFRWDEF) -Dcbf_system=default $(M4)/Makefile.m4 > Makefile.tmp
 	mv Makefile.tmp Makefile 
 
+cbflib.ini: $(M4)/Makefile.m4
+	echo  "$(LDPREFIX)" > cbflib.ini
+	echo  "HDF5_PLUGIN_PATH=$(SOLIB):$$HDF5_PLUGIN_PATH" >> cbflib.ini
+	echo  "export HDF5_PLUGIN_PATH" >> cbflib.ini
+
 symlinksdone:
 	chmod a+x .symlinks
 	chmod a+x .undosymlinks
@@ -1072,6 +1078,10 @@ baseinstall:  all $(CBF_PREFIX) $(CBF_PREFIX)/lib $(CBF_PREFIX)/bin \
 	-cp $(CBF_PREFIX)/lib/libfcb.so $(CBF_PREFIX)/lib/libfcb_old.so
 	cp $(SOLIB)/libfcb.so $(CBF_PREFIX)/lib/libfcb.so
 	$(LN) $(CBF_PREFIX)/lib/libfcb.so $(CBF_PREFIX)/lib/lib_fcb.so
+	-cp $(CBF_PREFIX)/bin/cbflib.ini $(CBF_PREFIX)/bin/cbflib.ini_old
+	echo  "$(RUNLDPREFIX)" > $(CBF_PREFIX)/bin/cbflib.ini
+	echo  "HDF5_PLUGIN_PATH=$(CBF_PREFIX)/lib:$$HDF5_PLUGIN_PATH" >> $(CBF_PREFIX)/bin/cbflib.ini
+	echo  "export HDF5_PLUGIN_PATH" >> $(CBF_PREFIX)/bin/cbflib.ini
 	-cp $(CBF_PREFIX)/bin/adscimg2cbf $(CBF_PREFIX)/bin/adscimg2cbf_old
 	cp $(BIN)/adscimg2cbf $(CBF_PREFIX)/bin/adscimg2cbf
 	-cp $(CBF_PREFIX)/bin/cbf2adscimg $(CBF_PREFIX)/bin/cbf2adscimg_old
@@ -1235,7 +1245,7 @@ $(TIFF):	build_tiff config.guess config.sub
 $(TIFF)_INSTALL:    $(TIFF)
 	-rm -rf $(TIFF)_install
 	rsync -avz $(TIFF)/  $(TIFF)_install
-	(cd $(TIFF_install); make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
+	(cd $(TIFF)_install; make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
 
 
 ifneq ($(CBFLIB_DONT_USE_LOCAL_HDF5),yes)
@@ -2070,7 +2080,7 @@ restore_output:		$(NEWTESTOUTPUT) $(DATADIRO) $(MINICBF_TEST)/minicbf.h5
 	cp test_fcb_read_testflatpackedout.out $(DATADIRO)/test_fcb_read_testflatpackedout_orig.out
 	cp XRD1621.cbf $(DATADIRO)/XRD1621_orig.cbf
 	cp XRD1621_I4encbC100.cbf $(DATADIRO)/XRD1621_I4encbC100_orig.cbf
-	cp minicbf_orig.h5 $(DATADIRO)/minicbf_orig.h5
+	cp $(MINICBF_TEST)/minicbf.h5 $(DATADIRO)/minicbf_orig.h5
 
 restore_sigs_only:	$(NEWTESTOUTPUT) $(DATADIRS)
 	$(SIGNATURE) < adscconverted_flat.cbf > $(DATADIRS)/adscconverted_flat_orig.cbf$(SEXT)
@@ -2088,7 +2098,7 @@ restore_sigs_only:	$(NEWTESTOUTPUT) $(DATADIRS)
 	$(SIGNATURE) < test_fcb_read_testflatpackedout.out > $(DATADIRS)/test_fcb_read_testflatpackedout_orig.out$(SEXT)
 	$(SIGNATURE) < XRD1621.cbf > $(DATADIRS)/XRD1621_orig.cbf$(SEXT)
 	$(SIGNATURE) < XRD1621_I4encbC100.cbf > $(DATADIRS)/XRD1621_I4encbC100_orig.cbf$(SEXT)
-	$(SIGNATURE) < minicbf_orig.h5 > $(DATADIRS)/minicbf_orig.h5$(SEXT)
+	$(SIGNATURE) < $(MINICBF_TEST)/minicbf.h5 > $(DATADIRS)/minicbf_orig.h5$(SEXT)
 restore_signatures:	restore_output restore_sigs_only
 
 #
@@ -2255,7 +2265,7 @@ endif
 	-cd $(MINICBF_TEST); $(DIFF) minicbf_original.dump minicbf.dump
 	$(LDPREFIX) cd $(MINICBF_TEST); rm -f minicbf_original.dump
 	$(LDPREFIX) cd $(MINICBF_TEST); rm -f minicbf.dump
-	cd $(MINICBF_TEST); rm -f minicbf.h5
+	#cd $(MINICBF_TEST); rm -f minicbf.h5
 	$(LDPREFIX) cd $(MINICBF_TEST); $(TIME) $(BIN)/cbf2nexus -c zlib \
 	--list -o i19-1.h5 ../1191_00005.cbf
 	$(LDPREFIX) cd $(MINICBF_TEST); $(TIME) $(BIN)/nexus2cbf \

diff --git a/Makefile_LINUX_64 b/Makefile_LINUX_64
@@ -580,6 +580,7 @@ SOCFLAGS = -fPIC
 SOLDFLAGS = -shared -Wl,-rpath,$(CBF_PREFIX)/lib
 JAVAINCLUDES = -I$(JDKDIR)/include -I$(JDKDIR)/include/linux
 LDPREFIX = LD_LIBRARY_PATH=$(SOLIB):$$LD_LIBRARY_PATH;export LD_LIBRARY_PATH;
+RUNLDPREFIX = LD_LIBRARY_PATH=$(CBF_PREFIX)/lib:$$LD_LIBRARY_PATH;export LD_LIBRARY_PATH;
 EXTRALIBS = -lm
 M4FLAGS = -Dfcb_bytes_in_rec=131072
 TIME = time
@@ -1028,6 +1029,11 @@ Makefile: $(M4)/Makefile.m4
 	m4 -P $(PYCIFRWDEF) -Dcbf_system=default $(M4)/Makefile.m4 > Makefile.tmp
 	mv Makefile.tmp Makefile 
 
+cbflib.ini: $(M4)/Makefile.m4
+	echo  "$(LDPREFIX)" > cbflib.ini
+	echo  "HDF5_PLUGIN_PATH=$(SOLIB):$$HDF5_PLUGIN_PATH" >> cbflib.ini
+	echo  "export HDF5_PLUGIN_PATH" >> cbflib.ini
+
 symlinksdone:
 	chmod a+x .symlinks
 	chmod a+x .undosymlinks
@@ -1073,6 +1079,10 @@ baseinstall:  all $(CBF_PREFIX) $(CBF_PREFIX)/lib $(CBF_PREFIX)/bin \
 	-cp $(CBF_PREFIX)/lib/libfcb.so $(CBF_PREFIX)/lib/libfcb_old.so
 	cp $(SOLIB)/libfcb.so $(CBF_PREFIX)/lib/libfcb.so
 	$(LN) $(CBF_PREFIX)/lib/libfcb.so $(CBF_PREFIX)/lib/lib_fcb.so
+	-cp $(CBF_PREFIX)/bin/cbflib.ini $(CBF_PREFIX)/bin/cbflib.ini_old
+	echo  "$(RUNLDPREFIX)" > $(CBF_PREFIX)/bin/cbflib.ini
+	echo  "HDF5_PLUGIN_PATH=$(CBF_PREFIX)/lib:$$HDF5_PLUGIN_PATH" >> $(CBF_PREFIX)/bin/cbflib.ini
+	echo  "export HDF5_PLUGIN_PATH" >> $(CBF_PREFIX)/bin/cbflib.ini
 	-cp $(CBF_PREFIX)/bin/adscimg2cbf $(CBF_PREFIX)/bin/adscimg2cbf_old
 	cp $(BIN)/adscimg2cbf $(CBF_PREFIX)/bin/adscimg2cbf
 	-cp $(CBF_PREFIX)/bin/cbf2adscimg $(CBF_PREFIX)/bin/cbf2adscimg_old
@@ -1236,7 +1246,7 @@ $(TIFF):	build_tiff config.guess config.sub
 $(TIFF)_INSTALL:    $(TIFF)
 	-rm -rf $(TIFF)_install
 	rsync -avz $(TIFF)/  $(TIFF)_install
-	(cd $(TIFF_install); make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
+	(cd $(TIFF)_install; make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
 
 
 ifneq ($(CBFLIB_DONT_USE_LOCAL_HDF5),yes)
@@ -2071,7 +2081,7 @@ restore_output:		$(NEWTESTOUTPUT) $(DATADIRO) $(MINICBF_TEST)/minicbf.h5
 	cp test_fcb_read_testflatpackedout.out $(DATADIRO)/test_fcb_read_testflatpackedout_orig.out
 	cp XRD1621.cbf $(DATADIRO)/XRD1621_orig.cbf
 	cp XRD1621_I4encbC100.cbf $(DATADIRO)/XRD1621_I4encbC100_orig.cbf
-	cp minicbf_orig.h5 $(DATADIRO)/minicbf_orig.h5
+	cp $(MINICBF_TEST)/minicbf.h5 $(DATADIRO)/minicbf_orig.h5
 
 restore_sigs_only:	$(NEWTESTOUTPUT) $(DATADIRS)
 	$(SIGNATURE) < adscconverted_flat.cbf > $(DATADIRS)/adscconverted_flat_orig.cbf$(SEXT)
@@ -2089,7 +2099,7 @@ restore_sigs_only:	$(NEWTESTOUTPUT) $(DATADIRS)
 	$(SIGNATURE) < test_fcb_read_testflatpackedout.out > $(DATADIRS)/test_fcb_read_testflatpackedout_orig.out$(SEXT)
 	$(SIGNATURE) < XRD1621.cbf > $(DATADIRS)/XRD1621_orig.cbf$(SEXT)
 	$(SIGNATURE) < XRD1621_I4encbC100.cbf > $(DATADIRS)/XRD1621_I4encbC100_orig.cbf$(SEXT)
-	$(SIGNATURE) < minicbf_orig.h5 > $(DATADIRS)/minicbf_orig.h5$(SEXT)
+	$(SIGNATURE) < $(MINICBF_TEST)/minicbf.h5 > $(DATADIRS)/minicbf_orig.h5$(SEXT)
 restore_signatures:	restore_output restore_sigs_only
 
 #
@@ -2256,7 +2266,7 @@ endif
 	-cd $(MINICBF_TEST); $(DIFF) minicbf_original.dump minicbf.dump
 	$(LDPREFIX) cd $(MINICBF_TEST); rm -f minicbf_original.dump
 	$(LDPREFIX) cd $(MINICBF_TEST); rm -f minicbf.dump
-	cd $(MINICBF_TEST); rm -f minicbf.h5
+	#cd $(MINICBF_TEST); rm -f minicbf.h5
 	$(LDPREFIX) cd $(MINICBF_TEST); $(TIME) $(BIN)/cbf2nexus -c zlib \
 	--list -o i19-1.h5 ../1191_00005.cbf
 	$(LDPREFIX) cd $(MINICBF_TEST); $(TIME) $(BIN)/nexus2cbf \