Index: jhdf-2.9/Makefile.in
===================================================================
--- jhdf-2.9.orig/Makefile.in	2012-12-05 11:46:21.000000000 +0100
+++ jhdf-2.9/Makefile.in	2012-12-05 11:46:35.000000000 +0100
@@ -30,10 +30,10 @@
 H5INC=@HDF5INC@
 
 #make this relative to the source root...
-LIBDIR=$(JH45INSTALLDIR)/lib
-BINDIR=$(JH45INSTALLDIR)/bin
-DOCDIR= $(JH45INSTALLDIR)/docs
-UGDIR= $(JH45INSTALLDIR)/UsersGuide
+LIBDIR=$(JH45INSTALLDIR)/usr/share/java
+BINDIR=$(JH45INSTALLDIR)/usr/bin
+DOCDIR= $(JH45INSTALLDIR)/usr/share/doc/libjhdf-doc/docs
+UGDIR= $(JH45INSTALLDIR)//usr/share/doc/libjhdf-doc/UsersGuide
 
 CLASS_DIR=$(TOP)/lib
 CP="$(CLASSPATH):$(CLASS_DIR):. "
@@ -324,7 +324,7 @@
 
 do-install-jhdf: jhdf-packages
 	-mkdir -p $(LIBDIR);
-	$(JAR) cf $(JH45INSTALLDIR)/lib/jhdf.jar -C $(CLASS_DIR) $(JHICLASSES)
+	$(JAR) cf $(LIBDIR)/jhdf.jar -C $(CLASS_DIR) $(JHICLASSES)
 	@echo "Install JHI complete"
 
 install-jhdf5: 
@@ -332,7 +332,7 @@
 
 do-install-jhdf5: jhdf5-packages
 	-mkdir -p $(LIBDIR);
-	$(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5.jar -C $(CLASS_DIR) $(JHI5CLASSES)
+	$(JAR) cf $(LIBDIR)/jhdf5.jar -C $(CLASS_DIR) $(JHI5CLASSES)
 	@echo "Install JHI5 complete"
 
 install-jhdfobj: ncsa.hdf.object
@@ -344,20 +344,20 @@
 
 do-install-jhdf4obj: ncsa.hdf.object.h4
 	-mkdir -p $(LIBDIR);
-	$(JAR) cf $(JH45INSTALLDIR)/lib/jhdf4obj.jar -C $(CLASS_DIR) $(H4OBJCLASSES)
+	$(JAR) cf $(LIBDIR)/jhdf4obj.jar -C $(CLASS_DIR) $(H4OBJCLASSES)
 	@echo "Install JHDF4 complete"
 
 do-install-jhdf5obj: ncsa.hdf.object.h5
 	-mkdir -p $(LIBDIR);
-	$(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES)
-	@echo "Install JHDF4 complete"
+	$(JAR) cf $(LIBDIR)/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES)
+	@echo "Install JHDF5 complete"
 
 install-jhdfview: ncsa.hdf.view
 	-mkdir -p $(LIBDIR);
-	$(JAR) cf $(JH45INSTALLDIR)/lib/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
+	$(JAR) cf $(LIBDIR)/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
 	-mkdir -p $(LIBDIR)/ext
-	$(JAR) cf $(JH45INSTALLDIR)/lib/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
-	$(JAR) cf $(JH45INSTALLDIR)/lib/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
+	$(JAR) cf $(LIBDIR)/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
+	$(JAR) cf $(LIBDIR)/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
 	$(RM) -rf $(UGDIR);
 	-mkdir -p $(UGDIR);
 	cp -R docs/hdfview/UsersGuide/* $(UGDIR);	
@@ -380,18 +380,18 @@
 	@echo "Install HDFVIEW complete"
 
 uninstall-jhi5: 
-	$(RM) -f $(JH45INSTALLDIR)/lib/jhdf5.jar
+	$(RM) -f $(LIBDIR)/lib/jhdf5.jar
 
 uninstall-jhi: 
-	$(RM) -f $(JH45INSTALLDIR)/lib/jhdf.jar
+	$(RM) -f $(LIBDIR)/lib/jhdf.jar
 
 uninstall-jhdfobj: 
-	$(RM) -f $(JH45INSTALLDIR)/lib/jhdfobj.jar
-	$(RM) -f $(JH45INSTALLDIR)/lib/jhdf4obj.jar
-	$(RM) -f $(JH45INSTALLDIR)/lib/jhdf5obj.jar
+	$(RM) -f $(LIBDIR)/lib/jhdfobj.jar
+	$(RM) -f $(LIBDIR)/lib/jhdf4obj.jar
+	$(RM) -f $(LIBDIR)/lib/jhdf5obj.jar
 
 uninstall-jhdfview: 
-	$(RM) -f $(JH45INSTALLDIR)/lib/jhdfview.jar;
+	$(RM) -f $(LIBDIR)/lib/jhdfview.jar;
 	$(RM) -rf $(UGDIR)
 
 install-docs: install-javadocs install-ug