diff -uprk.orig t1lib-5.0.2.orig/configure.in t1lib-5.0.2/configure.in --- t1lib-5.0.2.orig/configure.in 2004-03-06 05:14:03 +0300 +++ t1lib-5.0.2/configure.in 2004-04-12 17:37:21 +0400 @@ -85,6 +85,7 @@ test -z "$PROGEXT" && PROGEXT="" AC_SUB 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 @@ -92,6 +93,7 @@ dnl The following variables should be us 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) @@ -236,7 +238,7 @@ else 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 -uprk.orig t1lib-5.0.2.orig/lib/Makefile.in t1lib-5.0.2/lib/Makefile.in --- t1lib-5.0.2.orig/lib/Makefile.in 2004-04-12 17:37:10 +0400 +++ t1lib-5.0.2/lib/Makefile.in 2004-04-12 17:37:21 +0400 @@ -162,16 +162,16 @@ clean: dummy install: dummy $(MKINSTALLDIRS) $(RPM_BUILD_ROOT)$(libdir) $(MKINSTALLDIRS) $(RPM_BUILD_ROOT)$(includedir) - $(MKINSTALLDIRS) $(RPM_BUILD_ROOT)@T1LIB_DATA_DIR@ + $(MKINSTALLDIRS) $(RPM_BUILD_ROOT)@T1LIB_CONFIG_DIR@ $(LIBTOOL) --mode=install \ $(INSTALL_DATA) $(MAIN_TARGET) $(RPM_BUILD_ROOT)$(libdir) $(LIBTOOL) --mode=install \ $(INSTALL_DATA) $(MAIN_HEADER) $(RPM_BUILD_ROOT)$(includedir) - if (test -f $(RPM_BUILD_ROOT)@T1LIB_DATA_DIR@/t1lib.config) \ + if (test -f $(RPM_BUILD_ROOT)@T1LIB_CONFIG_DIR@/t1lib.config) \ then \ echo "Alert: Global configuration file exists, installation skipped!"; \ else \ - $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(RPM_BUILD_ROOT)@T1LIB_DATA_DIR@; \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(RPM_BUILD_ROOT)@T1LIB_CONFIG_DIR@; \ fi; @@ -180,7 +180,7 @@ uninstall: dummy -$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/libt1x.la -$(LIBTOOL) --mode=uninstall $(RM) $(includedir)/t1lib.h -$(LIBTOOL) --mode=uninstall $(RM) $(includedir)/t1libx.h - -$(LIBTOOL) --mode=uninstall $(RM) @T1LIB_DATA_DIR@/t1lib.config + -$(LIBTOOL) --mode=uninstall $(RM) @T1LIB_CONFIG_DIR@/t1lib.config dummy: diff -uprk.orig t1lib-5.0.2.orig/lib/t1lib.config t1lib-5.0.2/lib/t1lib.config --- t1lib-5.0.2.orig/lib/t1lib.config 1999-02-23 19:50:14 +0300 +++ t1lib-5.0.2/lib/t1lib.config 2004-04-12 17:37:21 +0400 @@ -2,7 +2,8 @@ This is the global configuration file fo 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=