*** src/Makefile.orig	Wed Oct  1 16:14:24 1997
--- src/Makefile	Wed Oct  1 16:23:58 1997
***************
*** 24,29 ****
--- 24,32 ----
  ### VFlib configurations
  #-------------------------
  
+ # Installation prefix.
+ PREFIX?= /usr/local
+ 
  # Maximum of open files
      OPENFILES = -DMAX_OPEN_FONT_FILES=6
  
***************
*** 32,38 ****
  #   SONY_FSLIB = -L/usr/sony/lib -lFSlib
  
  # VFontcap file
!         VFCAP = -DDEFAULT_VFCAP=\"/usr/local/TeX/lib/vfontcap\"
  
  # OS and Machine dependent compiling options
  #  Define __MSDOS__ (e.g., CCOPT=-D__MSDOS__) if you compile VFlib on MS-DOS
--- 35,41 ----
  #   SONY_FSLIB = -L/usr/sony/lib -lFSlib
  
  # VFontcap file
!         VFCAP = -DDEFAULT_VFCAP=\"${PREFIX}/lib/VFlib/vfontcap\"
  
  # OS and Machine dependent compiling options
  #  Define __MSDOS__ (e.g., CCOPT=-D__MSDOS__) if you compile VFlib on MS-DOS
***************
*** 45,51 ****
  # Compilers, compiling options, etc.
  #-------------------------
          CC = cc
!     CFLAGS = $(CCOPT) $(DEBUGOPT) -O
  
     LDFLAGS = $(LDOPT)
    SYS_LIBS = -lm
--- 48,54 ----
  # Compilers, compiling options, etc.
  #-------------------------
          CC = cc
!     CFLAGS = $(CCOPT) $(DEBUGOPT) -O -m486
  
     LDFLAGS = $(LDOPT)
    SYS_LIBS = -lm
***************
*** 60,68 ****
  #-------------------------
  # Installation Directories
  #-------------------------
! INSTALL_LIBDIR=/usr/local/lib
! INSTALL_INCDIR=/usr/local/include
! INSTALL_BINDIR=/usr/local/etc
  
  
  
--- 63,71 ----
  #-------------------------
  # Installation Directories
  #-------------------------
! INSTALL_LIBDIR=${PREFIX}/lib
! INSTALL_INCDIR=${PREFIX}/include
! INSTALL_BINDIR=${PREFIX}/lib/VFlib
  
  
  
***************
*** 82,96 ****
  #endif
  
  default:
! 	make libVFlib.a ttindex bdfindex fwindex
  all:
! 	make libVFlib.a ttindex bdfindex fwindex
  
  install:
  	-$(RM) -f $(INSTALL_LIBDIR)/VFlib.a $(INSTALL_LIBDIR)/libVFlib.a
  	$(CP) VFlib.a $(INSTALL_LIBDIR)/VFlib.a
  	-$(RANLIB) $(INSTALL_LIBDIR)/VFlib.a
  	$(LN) $(INSTALL_LIBDIR)/VFlib.a $(INSTALL_LIBDIR)/libVFlib.a
  	$(CP) VF.h $(INSTALL_INCDIR)/VF.h
  	$(CP) ttindex $(INSTALL_BINDIR)/ttindex
  	$(CP) bdfindex $(INSTALL_BINDIR)/bdfindex
--- 85,100 ----
  #endif
  
  default:
! 	make libVFlib.a libVFlib.so.2.22 ttindex bdfindex fwindex
  all:
! 	make libVFlib.a libVFlib.so.2.22 ttindex bdfindex fwindex
  
  install:
  	-$(RM) -f $(INSTALL_LIBDIR)/VFlib.a $(INSTALL_LIBDIR)/libVFlib.a
  	$(CP) VFlib.a $(INSTALL_LIBDIR)/VFlib.a
  	-$(RANLIB) $(INSTALL_LIBDIR)/VFlib.a
  	$(LN) $(INSTALL_LIBDIR)/VFlib.a $(INSTALL_LIBDIR)/libVFlib.a
+ 	$(INSTALL) -c -m 644 libVFlib.so.2.22 $(INSTALL_LIBDIR)/libVFlib.so.2.22
  	$(CP) VF.h $(INSTALL_INCDIR)/VF.h
  	$(CP) ttindex $(INSTALL_BINDIR)/ttindex
  	$(CP) bdfindex $(INSTALL_BINDIR)/bdfindex
***************
*** 98,112 ****
  
  clean:
  	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex fwindex bdfjpindex \
! 		   *.o core
  veryclean:
  	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex fwindex bdfjpindex\
! 	           *.o core *~ \#tz* 
  
  
  # Font drivers
  DRV_OBJ=  VF_Sony.o VF_Zeit.o VF_Jg.o VF_TT.o VF_Bdf.o VF_Hbf.o hbf.o \
  	  VF_Comp.o VF_BitOp.o VF_FNTWV.o VF_Comp2.o VF_Null.o
  
  
  # VFlib
--- 102,119 ----
  
  clean:
  	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex fwindex bdfjpindex \
! 		   *.o core *.so libVFlib.so.2.22
  veryclean:
  	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex fwindex bdfjpindex\
! 	           *.o core *~ \#tz* *.so libVFlib.so.2.22
  
  
  # Font drivers
  DRV_OBJ=  VF_Sony.o VF_Zeit.o VF_Jg.o VF_TT.o VF_Bdf.o VF_Hbf.o hbf.o \
  	  VF_Comp.o VF_BitOp.o VF_FNTWV.o VF_Comp2.o VF_Null.o
+    
+ DRV_SOBJ=  VF_Sony.so VF_Zeit.so VF_Jg.so VF_TT.so VF_Bdf.so VF_Hbf.so hbf.so \
+ 	   VF_Comp.so VF_BitOp.so VF_FNTWV.so VF_Comp2.so VF_Null.so
  
  
  # VFlib
***************
*** 117,122 ****
--- 124,133 ----
  	$(CP) libVFlib.a VFlib.a
  	-$(RANLIB) VFlib.a
  
+ libVFlib.so.2.22:	VFlib.so VFenc.so VFEtable.so VFcap.so fn2ent.so fman.so $(DRV_SOBJ)
+ 	$(LD) -x -Bshareable -o libVFlib.so.2.22 \
+ 	VFlib.so VFenc.so VFEtable.so VFcap.so fn2ent.so fman.so $(DRV_SOBJ)
+ 
  # VFlib
  VFlib.o:  	VFlib.c
  	$(CC) $(CFLAGS) $(USEFSLIB)  -c VFlib.c
***************
*** 170,175 ****
--- 181,264 ----
  # Null font driver
  VF_Null.o:  	VF_Null.c
  	$(CC) $(CFLAGS)  -c VF_Null.c
+ 
+ # VFlib
+ VFlib.so:  	VFlib.c
+ 	$(CC) -fpic -DPIC $(CFLAGS) $(USEFSLIB)  -c VFlib.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ 
+ # font capability database 
+ VFcap.so:	VFcap.c
+ 	$(CC) -fpic -DPIC $(CFLAGS) $(VFCAP) -c VFcap.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ 
+ # handling of font encodings
+ VFenc.so:	VFenc.c
+ 	$(CC) -fpic -DPIC $(CFLAGS) -c VFenc.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ 
+ # font encoding and character set tables
+ VFEtable.so:	VFEtable.c
+ 	$(CC) -fpic -DPIC $(CFLAGS) -c VFEtable.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ 
+ # conv font name to font entry name
+ fn2ent.so:	fn2ent.c
+ 	$(CC) -fpic -DPIC $(CFLAGS)  -c fn2ent.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ 
+ # dynamic file stream manager
+ fman.so:		fman.c
+ 	$(CC) -fpic -DPIC $(CFLAGS) $(OPENFILES) -c fman.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ 
+ # Sony Font driver
+ VF_Sony.so:  	VF_Sony.c
+ 	$(CC) -fpic -DPIC $(CFLAGS) $(USEFSLIB) -c VF_Sony.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ # Zeit Syotai-Club Font driver
+ VF_Zeit.so:  	VF_Zeit.c
+ 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Zeit.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ # Zeit JG Font driver
+ VF_Jg.so:  	VF_Jg.c
+ 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Jg.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ # TrueType Driver
+ VF_TT.so:  	VF_TT.c
+ 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_TT.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ # BDF Driver
+ VF_Bdf.so:  	VF_Bdf.c
+ 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Bdf.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ # HBF Driver
+ VF_Hbf.so:	VF_Hbf.c
+ 	$(CC) -fpic -DPIC $(CFLAGS) -D$(FS) -c VF_Hbf.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ hbf.so:	hbf.c
+ 	$(CC) -fpic -DPIC $(CFLAGS) -D$(FS) -DNO_STRDUP -c hbf.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ # Composite font driver
+ VF_Comp.so:  	VF_Comp.c
+ 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Comp.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ # Composite font driver
+ VF_Comp2.so:  	VF_Comp2.c
+ 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Comp2.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ # Bit-Operated font driver
+ VF_BitOp.so:  	VF_BitOp.c
+ 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_BitOp.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ # Null font driver
+ VF_Null.so:  	VF_Null.c
+ 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Null.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
+ # FontWave font driver
+ VF_FNTWV.so:  	VF_FNTWV.c
+ 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_FNTWV.c -o $(.TARGET)
+ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
  
  # Index generator for TrueType font
  ttindex:	ttindex.c