jhdf (2.6.1-1) z_nc2-fits-disabled.diff

Summary

 Makefile.in |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

    
download this patch

Patch contents

Index: jhdf-2.6/Makefile.in
===================================================================
--- jhdf-2.6.orig/Makefile.in	2010-01-23 21:27:55.000000000 +0100
+++ jhdf-2.6/Makefile.in	2010-01-23 21:29:40.000000000 +0100
@@ -40,9 +40,9 @@
 
 H5OBJDISTFILES= ./ncsa/hdf/object/h5/*.java 
 
-FITSDISTJARFILE = ./lib/fits.jar
-NC2SDISTJARFILE = ./lib/netcdf.jar
-JUNITSDISTJARFILE = ./lib/junit.jar
+#FITSDISTJARFILE = ./lib/fits.jar
+#NC2SDISTJARFILE = ./lib/netcdf.jar
+#JUNITSDISTJARFILE = ./lib/junit.jar
 
 NC2OBJDISTFILES= ./ncsa/hdf/object/nc2/*.java ./lib/netcdf.jar 
 
@@ -120,7 +120,7 @@
 
 install-just-hdf5: install-hdf5lib install-jhdf5
 
-packages: jhdf-packages jhdf5-packages nc2-packages fits-packages jhdfobj-packages jhdfview-packages
+packages: jhdf-packages jhdf5-packages jhdfobj-packages jhdfview-packages
 
 jhdf-packages: 
 	@if test -n "$(H4INC)" ; then $(MAKE) do-jhdf-packages; fi
@@ -330,17 +330,17 @@
 	-mkdir -p $(LIBDIR);
 	$(JAR) cf $(LIBDIR)/jhdfview.jar $(HDFVIEWCLASSES) $(HDFVIEWICONS)
 	-mkdir -p $(LIBDIR)/ext
-	$(JAR) cf $(LIBDIR)/ext/nc2obj.jar $(NC2OBJCLASSES)
-	$(JAR) cf $(LIBDIR)/ext/fitsobj.jar $(FITSOBJCLASSES)
+#	$(JAR) cf $(LIBDIR)/ext/nc2obj.jar $(NC2OBJCLASSES)
+#	$(JAR) cf $(LIBDIR)/ext/fitsobj.jar $(FITSOBJCLASSES)
 	$(RM) -rf $(UGDIR);
 	-mkdir -p $(UGDIR);
 	cp -R docs/hdfview/UsersGuide/* $(UGDIR);	
 	$(RM) -rf $(UGDIR)/.svn
 	$(RM) -rf $(UGDIR)/images/.svn
 	-mkdir -p $(BINDIR);
-	cp lib/netcdf.jar $(LIBDIR)
-	cp lib/fits.jar $(LIBDIR)
-	cp lib/junit.jar $(LIBDIR)
+#	cp lib/netcdf.jar $(LIBDIR)
+#	cp lib/fits.jar $(LIBDIR)
+#	cp lib/junit.jar $(LIBDIR)
 	cp bin/hdfview.sh $(BINDIR)
 	chmod a+x $(BINDIR)/hdfview.sh
 	@echo "Install HDFVIEW complete"