--- Makefile.orig	2007-04-19 11:32:17.940863000 +0100
+++ Makefile	2007-04-19 12:00:47.449801500 +0100
@@ -628,17 +628,17 @@
 "PIC=$(PIC_$(OS)_$(ENV))" \
 "CCx=$(CC_$(OS)_$(ENV))" \
 "LDx=$(LD_$(OS)_$(ENV))" \
-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
 "SYSLIBS=$(SYSLIBSshr_$(OS)_$(ENV))" \
 "SHAREDEXT=$(SHAREDEXT_$(OS))" \
-"LDOPTIONS=$(LDOPTIONS_$(OS)_$(ENV))" \
+"LDOPTIONS=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))" \
 "AROPTIONS=$(AROPTIONS_$(OS))" \
 "RANLIB=$(RANLIB_$(OS))" \
 all
 	@cd $(TOOLSsrcDIR); $(MAKE) \
 "CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
 "CCx=$(CC_$(OS)_$(ENV))" \
-"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
 "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
 "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
 "CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
@@ -648,7 +648,7 @@
 "FCx=$(FC_$(OS))" \
 "CCx=$(CC_$(OS)_$(ENV))" \
 "SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
-"FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
+"FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
 "FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
 "COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
 "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
@@ -676,14 +676,19 @@
 install: install.$(PART)
 
 install.all: install.definitions install.include install.lib \
-	     install.tools install.help_ notify.user
+	     install.tools install.help_
 
-install.definitions: create.bin copy.definitions change.definitions
+install.definitions: create.bin
 install.include: create.include copy.include
 install.tools: create.bin copy.tools
 install.help_: create.help copy.help
 
 install.lib: create.lib copy.lib.a
+	@if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
+	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
+	 else \
+	   $(NULL) ; \
+	 fi
 	@if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
 	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
 	 else \
@@ -778,8 +783,8 @@
 	      cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
 
 copy.lib.so:
-	@echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
-	      cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
+	@echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
+	      cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
 
 copy.lib.sl:
 	@echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
@@ -1787,12 +1792,12 @@
 	@echo FOPTIONS=$(FOPTIONS_$(OS))
 	@echo FOPTIONSld=$(FOPTIONSld_$(OS))
 	@echo SHAREDEXT=$(SHAREDEXT_$(OS))
-	@echo LDOPTIONSlibcdf=$(LDOPTIONS_$(OS)_$(ENV))
+	@echo LDOPTIONSlibcdf=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))
 	@echo RANLIB=$(RANLIB_$(OS))
 	@echo FCx=$(FC_$(OS))
 	@echo CCx=$(CC_$(OS)_$(ENV))
 	@echo PIC=$(PIC_$(OS)_$(ENV))
-	@echo COPTIONS=$(COPTIONS_$(OS)_$(ENV))
+	@echo COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))
 	@echo COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))
 	@echo CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))
 	@echo SYSLIBSexe=$(SYSLIBSexe_$(OS)_$(ENV))