diff -Nurd -x'*~' VFlib3-3.6.14.orig/Makefile.in VFlib3-3.6.14/Makefile.in
--- VFlib3-3.6.14.orig/Makefile.in	2002-12-09 19:52:10.000000000 -0500
+++ VFlib3-3.6.14/Makefile.in	2009-04-26 15:33:18.000000000 -0400
@@ -13,7 +13,7 @@
 
 default all:
 	for d in $(MAKE_SUBDIRS) ; do \
-	  (cd $$d ; $(MAKE) $@); done
+	  (cd $$d ; $(MAKE) $@) || exit 1; done
 
 install:
 	@if [ ! -d $(bindir) ] ; then \
@@ -25,7 +25,7 @@
 	@if [ ! -d $(runtimedir) ] ; then \
 	    ./recmkdir $(runtimedir); fi
 	@for d in $(INST_SUBDIRS) ; do \
-	  (cd $$d ; $(MAKE) $@); done
+	  (cd $$d ; $(MAKE) $@) || exit 1; done
 	@echo "Installing vflibcaps..."
 	@for f in `ls ./vflibcaps/vflibcap*`; do \
 	   ./$(INSTALL_DATA) $$f $(runtimedir); done
diff -Nurd -x'*~' VFlib3-3.6.14.orig/VFlib3-config.in VFlib3-3.6.14/VFlib3-config.in
--- VFlib3-3.6.14.orig/VFlib3-config.in	2001-05-30 00:40:15.000000000 -0400
+++ VFlib3-3.6.14/VFlib3-config.in	2009-04-26 15:33:18.000000000 -0400
@@ -158,15 +158,15 @@
 fi
 
 if test "$echo_runtime_dir" = "yes"; then
-  S="$S $datadir/VFlib/$version"
+  S="$S $datadir/vflib/"
 fi
 
 if test "$echo_runtime_site_dir" = "yes"; then
-  S="$S $datadir/VFlib/site"
+  S="$S $datadir/vflib/site"
 fi      
 
 if test "$echo_vflibcap" = "yes"; then
-  S="$S $datadir/VFlib/$version/vflibcap"
+  S="$S $datadir/vflib/$version/vflibcap"
 fi      
 
 echo $S
diff -Nurd -x'*~' VFlib3-3.6.14.orig/acinclude.m4 VFlib3-3.6.14/acinclude.m4
--- VFlib3-3.6.14.orig/acinclude.m4	1969-12-31 19:00:00.000000000 -0500
+++ VFlib3-3.6.14/acinclude.m4	2009-04-26 16:58:26.000000000 -0400
@@ -0,0 +1,50 @@
+dnl  local autoconf file for TypeHack
+
+dnl  The following creates the needed soft links. It simply traverses
+dnl  the whole directory tree and links the unversioned directory to
+dnl  the versioned. The structure of versioned directories must be
+dnl  <Name>-<Version>; <Version> can only contain numbers and dots.
+dnl
+dnl  example:  VFlib-src -> VFlib-src-3.1.2
+
+
+AC_DEFUN([AC_STARTUP],
+[
+changequote(<, >)dnl
+working_dir=`pwd`
+for curr_dir in `find $working_dir -type d -print`; do
+  new_dir=`echo $curr_dir | sed -e 's|^\(.*\)-[0-9.][0-9.]*$|\1|'`
+  if test $curr_dir != $new_dir; then
+    r_curr_dir=`echo $curr_dir | sed -e "s|$working_dir/||"`
+    r_new_dir=`echo $new_dir | sed -e "s|$working_dir/||"`
+    echo Making a symbolic link: $r_new_dir '->' $r_curr_dir
+    s_curr_dir=`echo $r_curr_dir | sed -e 's|.*/\([^/]*\)$|\1|'`
+    s_new_dir=`echo $r_new_dir | sed -e 's|.*/\([^/]*\)$|\1|'`
+    rm -f $new_dir
+    # echo "(cd $curr_dir/..; ln -s $s_curr_dir $s_new_dir)"
+    (cd $curr_dir/..; ln -s $s_curr_dir $s_new_dir)
+  fi
+done
+dnl AC_PROVIDE([AC_STARTUP])
+changequote([, ])dnl
+])
+
+
+dnl AC_ARG_DISABLE(PACKAGE, HELP-STRING, ACTION-IF-DISABLED 
+dn                                    [, ACTION-IF-NOT-DISABLED])
+AC_DEFUN([AC_ARG_DISABLE],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+ac_help="$ac_help
+[$2]"
+AC_DIVERT_POP()dnl
+[#] Check whether --enable-[$1] or --disable-[$1] was given.
+if    test x-"[${enable_]patsubst([$1], -, _)}" = x-no ; then
+  enableval="[${enable_]patsubst([$1], -, _)}"
+  ifelse([$3], , :, [$3])
+ifelse([$4], , , [else
+  $4
+])dnl
+fi
+])
diff -Nurd -x'*~' VFlib3-3.6.14.orig/configure.in VFlib3-3.6.14/configure.in
--- VFlib3-3.6.14.orig/configure.in	2005-04-07 20:27:58.000000000 -0400
+++ VFlib3-3.6.14/configure.in	2009-04-26 16:55:07.000000000 -0400
@@ -2,7 +2,7 @@
 dnl  by H.Kakugawa (h.kakugawa@computer.org)
 
 AC_INIT(src/VFsys.h)
-AC_REQUIRE([AC_STARTUP])
+AC_STARTUP
 
 dnl configure libtool
 AM_DISABLE_STATIC
@@ -78,9 +78,9 @@
 AC_SUBST(subdir_ascii_jtex)
 AC_SUBST(texmf_root)
 
-default_vflibcap=${datadir}/VFlib/${vflib_version}/vflibcap
-runtimesitedir=${datadir}/VFlib/site
-runtimedir=${datadir}/VFlib/${vflib_version}
+default_vflibcap=${datadir}/vflib/vflibcap
+runtimesitedir=${datadir}/vflib/site
+runtimedir=${datadir}/vflib/${vflib_version}
 subdir_ccv=ccv
 subdir_t1enc=t1lib
 subdir_ascii_jtex=ascii-jtex
diff -Nurd -x'*~' VFlib3-3.6.14.orig/make-sub.in VFlib3-3.6.14/make-sub.in
--- VFlib3-3.6.14.orig/make-sub.in	2001-05-30 00:32:02.000000000 -0400
+++ VFlib3-3.6.14/make-sub.in	2009-04-26 18:03:02.000000000 -0400
@@ -23,6 +23,7 @@
 bindir      = @bindir@
 includedir  = @includedir@
 infodir     = @infodir@
+datarootdir = @datarootdir@
 
 default_vflibcap  = @default_vflibcap@
 runtimesitedir    = @runtimesitedir@
diff -Nurd -x'*~' VFlib3-3.6.14.orig/src/vflmkcaptex VFlib3-3.6.14/src/vflmkcaptex
--- VFlib3-3.6.14.orig/src/vflmkcaptex	2006-02-26 18:32:34.000000000 -0500
+++ VFlib3-3.6.14/src/vflmkcaptex	2009-04-26 15:33:18.000000000 -0400
@@ -32,7 +32,7 @@
 version="1.1"
 
 vflibversion="3.6.14"
-prefix=/usr/local
+prefix=@FINKPREFIX@
 datadir=${prefix}/share
 
 
@@ -644,9 +644,9 @@
     opt="${comopt1} ${comopt2}"
     opt="${opt} -x .pk"
     opt="${opt} -a TEXMF"
-    opt="${opt} -e ${datadir}/VFlib/${vflibversion}/t1lib"
-    opt="${opt} -e ${datadir}/VFlib/site"
-    opt="${opt} -e ${datadir}/VFlib/site/t1lib"
+    opt="${opt} -e ${datadir}/vflib/t1lib"
+    opt="${opt} -e ${datadir}/vflib/site"
+    opt="${opt} -e ${datadir}/vflib/site/t1lib"
     opt="${opt} -f -t"
     type1_opt=""
     type1_gs_opt=""
diff -Nurd -x'*~' VFlib3-3.6.14.orig/src/vflmkcaptex.in VFlib3-3.6.14/src/vflmkcaptex.in
--- VFlib3-3.6.14.orig/src/vflmkcaptex.in	2005-07-22 03:41:43.000000000 -0400
+++ VFlib3-3.6.14/src/vflmkcaptex.in	2009-04-26 15:33:18.000000000 -0400
@@ -644,9 +644,9 @@
     opt="${comopt1} ${comopt2}"
     opt="${opt} -x .pk"
     opt="${opt} -a TEXMF"
-    opt="${opt} -e ${datadir}/VFlib/${vflibversion}/t1lib"
-    opt="${opt} -e ${datadir}/VFlib/site"
-    opt="${opt} -e ${datadir}/VFlib/site/t1lib"
+    opt="${opt} -e ${datadir}/vflib/t1lib"
+    opt="${opt} -e ${datadir}/vflib/site"
+    opt="${opt} -e ${datadir}/vflib/site/t1lib"
     opt="${opt} -f -t"
     type1_opt=""
     type1_gs_opt=""
diff -Nurd -x'*~' VFlib3-3.6.14.orig/src/vflserver.c VFlib3-3.6.14/src/vflserver.c
--- VFlib3-3.6.14.orig/src/vflserver.c	2005-07-12 03:45:47.000000000 -0400
+++ VFlib3-3.6.14/src/vflserver.c	2009-04-26 15:33:18.000000000 -0400
@@ -147,7 +147,7 @@
 	&& ((strcmp(argv[0], "-h") == 0) || (strcmp(argv[0], "-help") == 0))){
       printf("VFLSERVER - a VFlib server\n");
       printf("Usage: vflserver [-v vflibcap] [cmd-file ... ]\n"); 
-      printf("  Example:   ./vflserver -v /usr/local/lib/VFlib3/vflibcap\n");
+      printf("  Example:   ./vflserver -v @FINKPREFIX@/lib/vflib3/vflibcap\n");
       exit(0);
     } else if ((argc >= 2) && (strcmp(argv[0], "-v") == 0)){
       --argc; argv++;
diff -Nurd -x'*~' VFlib3-3.6.14.orig/utils/Makefile.in VFlib3-3.6.14/utils/Makefile.in
--- VFlib3-3.6.14.orig/utils/Makefile.in	1999-10-31 19:24:11.000000000 -0500
+++ VFlib3-3.6.14/utils/Makefile.in	2009-04-26 15:33:18.000000000 -0400
@@ -7,12 +7,12 @@
 
 default all: 
 	@for d in $(SUBDIRS) ; do \
-	  (cd $$d ; $(MAKE) $@); done 
+	  (cd $$d ; $(MAKE) $@) || exit 1; done 
 
 install uninstall::
 	@echo "Installing utility programs..."
 	@for d in $(SUBDIRS) ; do \
-	  (cd $$d ; $(MAKE) $@); done 
+	  (cd $$d ; $(MAKE) $@) || exit 1; done 
 
 clean veryclean::
 	for d in $(SUBDIRS) ; do \
diff -Nurd -x'*~' VFlib3-3.6.14.orig/utils/ctext2pgm-1.5.3/Makefile.in VFlib3-3.6.14/utils/ctext2pgm-1.5.3/Makefile.in
--- VFlib3-3.6.14.orig/utils/ctext2pgm-1.5.3/Makefile.in	1999-10-31 19:24:24.000000000 -0500
+++ VFlib3-3.6.14/utils/ctext2pgm-1.5.3/Makefile.in	2009-04-26 18:56:13.000000000 -0400
@@ -22,7 +22,7 @@
 		$(CC) $(VFCFLAGS) -o ctext2pgm ctext2pgm.o  \
 		    $(VFLIB_DIR)/libVFlib3.la
 ctext2pgm.o: ctext2pgm.c ctext2pgm.h fontdef.h
-	$(CC) $(VFCFLAGS) -I$(VFLIB_DIR) -c ctext2pgm.c
+	$(CC) -I$(VFLIB_DIR) $(VFCFLAGS) -c ctext2pgm.c
 
 ctext2pgms: ctext2pgm.o $(VFLIB_DIR)/libVFlib3.la
 	$(LIBTOOL) --mode=link  \
diff -Nurd -x'*~' VFlib3-3.6.14.orig/utils/vfl2bdf-2.0.0/Makefile.in VFlib3-3.6.14/utils/vfl2bdf-2.0.0/Makefile.in
--- VFlib3-3.6.14.orig/utils/vfl2bdf-2.0.0/Makefile.in	1999-10-31 19:21:32.000000000 -0500
+++ VFlib3-3.6.14/utils/vfl2bdf-2.0.0/Makefile.in	2009-04-26 18:57:06.000000000 -0400
@@ -25,7 +25,7 @@
 		  $(VFLIB_DIR)/libVFlib3.la
 
 vfl2bdf.o: vfl2bdf.c
-	$(CC) $(VFCFLAGS) -I$(VFLIB_DIR) -c vfl2bdf.c
+	$(CC) -I$(VFLIB_DIR) $(VFCFLAGS) -c vfl2bdf.c
 
 install: $(PROGRAM)
 	@$(LIBTOOL) --mode=install \