diff -rupN Avl/bin/Makefile Avl-new/bin/Makefile
--- Avl/bin/Makefile	2015-11-03 14:37:17.000000000 +0100
+++ Avl-new/bin/Makefile	2017-02-08 10:43:00.507862894 +0100
@@ -2,8 +2,17 @@
 # Makefile for AVL
 #
 
-BINDIR = /home/codes/bin/
-INSTALLCMD = install -s
+FC = gfortran
+
+#Subroutine SECOND source file
+SECOND = second_g77.f
+
+# override FFLAGS += -fdefault-real-8
+
+PLTOBJ = ../plotlib/libPlt.a
+PLTLIB = -lX11
+
+EIGOBJ = ../eispack/eispack.a
 
 SRC = ../src
 
@@ -18,103 +27,22 @@ userio.o plutil.o arrow3d.o getvm.o \
 matrix.o spline.o sgutil.o \
 second.o
 
-PLTOBJ = ../plotlib/libPlt.a
-EIGOBJ = ../eispack/eispack.a
-## EIGOBJ = eispack.o
-
 ###================================================
-###  Default compilers and flags
-FC = f77
-FFLAGS = -O
-PLTLIB = -lX11
-FTNLIB =
-
-#Subroutine SECOND source file
-SECOND = second_g77.f
-
-##--------------------------
-
-# Uncomment flags for desired machine...
-
-##--------------------------
-### DEC Alpha with OSF and DEC f77/f90 compiler
-#FC = f77
-#FFLAGS  = -fast -O4 -tune host
-##--------------------------
-### SGI setup
-#FC = f77
-#FFLAGS  = -O2
-##--------------------------
-##  Uncomment for RS/6000
-#FFLAGS  = -O -qextname
-##--------------------------
-##  Uncomment for HP-9000
-#FFLAGS  = -O +ppu
-#FTNLIB  = -U77
-##--------------------------
-### Absoft Linux f77
-#FC = f77
-#FFLAGS  = -O -f -s -W -B108 -N34
-##--------------------------
-### f2c/gcc compiler driver 
-#FC = fort77
-#FFLAGS  =  -O2 -fomit-frame-pointer
-##--------------------------
-### GNU g77
-#FC = g77
-#FFLAGS = -O3
-##--------------------------
-### Intel Fortran Compiler 8.x
-FC = ifort
-FFLAGS = -O 
-PLTLIB = -L/usr/X11R6/lib -lX11
-SECOND = second_ifc.f
-#FTNLIB = -Vaxlib
-##--------------------------
-### double-precision option (also need double precision Eispack and libPlt)
-FFLAGS = -O -r8
-PLTOBJ = ../plotlib/libPltDP.a
-
-##---------------------------------------
-##  Uncomment for Mac OSX gfortran
-FC = gfortran
-
-ACHK = -fbounds-check -finit-real=inf -ffpe-trap=invalid,zero,denormal
-#ACHK =
-
-
-#FTNLIB = -Vaxlib
-FTNLIB = 
-SECOND = second_g77.f
-
-DP =
-PLTOBJ = ../plotlib/libPlt_gDP.a
-EIGOBJ = ../eispack/eispack_gDP.a
-
-DP = -fdefault-real-8
-PLTOBJ = ../plotlib/libPlt_gDP.a
-EIGOBJ = ../eispack/eispack_gDP.a
-
-FFLAGS = -O  $(ACHK) $(DP)
-##---------------------------------------
-
-
 
 all:	 $(PROGS)
 
 install: $(PROGS)
-	$(INSTALLCMD) $(PROGS) $(BINDIR)
+	install -Dm 0755 avl $(DESTDIR)$(BINDIR)/avl
 
 clean: 
-	-/bin/rm $(PROGS)
-	-/bin/rm *.o
+	rm $(PROGS)
+	rm *.o
 
 $(SRC)/AVL.INC: $(SRC)/AINDEX.INC
 	touch $(SRC)/AVL.INC
 
 avl: $(AOBJS)
 	$(FC) -o avl $(AOBJS)  $(ALIBS) $(PLTOBJ) $(EIGOBJ) $(PLTLIB) $(FTNLIB)
-	$(INSTALLCMD) avl $(BINDIR)
 
 dtest: dtest.o
 	$(FC) -o dtest dtest.o
diff -rupN Avl/eispack/Makefile Avl-new/eispack/Makefile
--- Avl/eispack/Makefile	2015-04-17 22:50:20.000000000 +0200
+++ Avl-new/eispack/Makefile	2017-02-08 10:40:20.980387082 +0100
@@ -1,22 +1,15 @@
 
+EISLIB = eispack.a
 FC = gfortran
-FLG = -O
-AR = ar r
-RAN = ranlib
-
-DP =
-EISLIB = eispack_gSP.a
-
-#DP = -fdefault-real-8
-#EISLIB = eispack_gDP.a
+# DP = -fdefault-real-8
 
 
 $(EISLIB): eispack.f
-	$(FC) -c $(FLG) $(DP) eispack.f
-	$(AR) $(EISLIB) eispack.o
-	$(RAN) $(EISLIB)
+	$(FC) -c $(FFLAGS) $(DP) eispack.f
+	ar -r  $(EISLIB) eispack.o
+	ranlib $(EISLIB)
 
 clean:
-	/bin/rm *.o *.a
+	rm -f *.o *.a
 
 
diff -rupN Avl/plotlib/Makefile Avl-new/plotlib/Makefile
--- Avl/plotlib/Makefile	2015-04-17 22:51:21.000000000 +0200
+++ Avl-new/plotlib/Makefile	2017-02-08 10:40:20.981387079 +0100
@@ -21,23 +21,16 @@
 #                        or drela@mit.edu  
 #***********************************************************************
 
-
-#================================#
-# Makefile for Xplot11 library   #
-#  edit the config.make file to  #
-#  set specific options for your #
-#  system                        #
-#================================#
-
 # Point to your install directory
-#INSTALLDIR = /home/codes/bin
-#INSTALLDIR = /usr/local/lib
 INSTALLDIR = .
 
-# Use these to set default library name (overridden in config.make file) 
+FC = gfortran
+
 PLTLIB = libPlt.a
-#PLTLIB = libPltDP.a
 
+# Some fortrans need trailing underscores in C interface symbols (see Xwin.c)
+override CFLAGS += -DUNDERSCORE
+# override FFLAGS += -fdefault-real-8
 
 ###========================================================
 ###  Basic plot library object files
@@ -67,16 +60,11 @@ OBJ3D  = plt_3D.o
 
 
 ###-------------------------------------------------------------------------
-### Set compiler, compiler flags, name of output object library
-include ./config.make
-
-
-###-------------------------------------------------------------------------
 ### Basic make targets - build library, test programs
 
 $(PLTLIB):  $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
-	$(AR)     $(PLTLIB) $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
-	$(RANLIB) $(PLTLIB)
+	ar -r  $(PLTLIB) $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
+	ranlib $(PLTLIB)
 
 test:  $(PLTLIB)
 	(cd examples; make test)
@@ -86,13 +74,13 @@ test:  $(PLTLIB)
 ### Utility functions - install the library, clean the directory
 
 install:  $(PLTLIB)
-	mv $(PLTLIB) $(INSTALLDIR)
-	$(RANLIB)   $(INSTALLDIR)/$(PLTLIB)
+	mv     $(PLTLIB) $(INSTALLDIR)
+	ranlib $(INSTALLDIR)/$(PLTLIB)
 
 clean:
-	-/bin/rm $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
-	-/bin/rm $(PLTLIB)
-	-/bin/rm plot*.ps
+	rm -f $(OBJ) $(OBJOLD) $(OBJ3D) $(OBJMISC)
+	rm -f $(PLTLIB)
+	rm -f plot*.ps
 	(cd examples; make clean)