diff -Naur t1lib-5.1.2-orig/configure.in t1lib-5.1.2/configure.in --- t1lib-5.1.2-orig/configure.in 2007-12-23 18:49:43 +0300 +++ t1lib-5.1.2/configure.in 2008-05-10 15:22:52 +0400 @@ -84,6 +84,7 @@ test -z "$CFLAGS" AC_SUBST(CFLAGS) test -z "$LDFLAGS" AC_SUBST(LDFLAGS) +T1LIB_CONFIG_DIR="${sysconfdir}/t1lib" T1LIB_DATA_DIR="${datadir}/t1lib" dnl The following variables should be used @@ -91,6 +92,7 @@ AC_SUBST(T1LIB_LT_CURRENT) AC_SUBST(T1LIB_LT_REVISION) AC_SUBST(T1LIB_LT_AGE) +AC_SUBST(T1LIB_CONFIG_DIR) AC_SUBST(T1LIB_DATA_DIR) AC_SUBST(T1LIB_IDENTIFIER) AC_SUBST(MAIN_TARGET) @@ -241,7 +243,7 @@ fi -CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_DATA_DIR}\\\"\"" +CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_CONFIG_DIR}\\\"\"" dnl **** Check for functions and header files **** diff -Naur t1lib-5.1.2-orig/lib/Makefile.in t1lib-5.1.2/lib/Makefile.in --- t1lib-5.1.2-orig/lib/Makefile.in 2007-12-23 18:49:42 +0300 +++ t1lib-5.1.2/lib/Makefile.in 2008-05-10 15:29:12 +0400 @@ -161,16 +161,16 @@ install: dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(MKINSTALLDIRS) $(DESTDIR)$(includedir) - $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@ + $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_CONFIG_DIR@ $(LIBTOOL) --mode=install \ $(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir) $(LIBTOOL) --mode=install \ $(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir) - if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \ + if (test -f $(DESTDIR)@T1LIB_CONFIG_DIR@/t1lib.config) \ then \ echo "Alert: Global configuration file exists, installation skipped!"; \ else \ - $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_CONFIG_DIR@; \ fi; @@ -179,7 +179,7 @@ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libt1x.la -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1lib.h -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1libx.h - -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config + -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_CONFIG_DIR@/t1lib.config dummy: diff -Naur t1lib-5.1.2-orig/lib/t1lib.config t1lib-5.1.2/lib/t1lib.config --- t1lib-5.1.2-orig/lib/t1lib.config 2007-12-23 18:49:42 +0300 +++ t1lib-5.1.2/lib/t1lib.config 2008-05-10 15:30:04 +0400 @@ -2,7 +2,8 @@ Note that it is not of any use if not setup by the system administrator. For information on how to set up these things see the t1lib-manual. - -ENCODING=. -AFM=. -TYPE1=. + +ENCODING=/usr/share/t1lib/enc +AFM=/usr/share/fonts/default/Type1 +TYPE1=/usr/share/fonts/default/Type1 +#FONTDATABASE=