--- t1lib-5.0.0/xglyph/Makefile.in.install 2001-01-15 23:06:53.000000000 +0100
+++ t1lib-5.0.0/xglyph/Makefile.in 2003-10-09 14:20:21.000000000 +0200
@@ -94,8 +94,8 @@
install: dummy
- $(MKINSTALLDIRS) $(bindir)
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xglyph $(bindir)/xglyph
+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xglyph $(DESTDIR)$(bindir)/xglyph
uninstall: dummy
--- t1lib-5.0.0/lib/Makefile.in.install 2002-06-25 04:15:30.000000000 +0200
+++ t1lib-5.0.0/lib/Makefile.in 2003-10-09 14:20:21.000000000 +0200
@@ -160,18 +160,19 @@
install: dummy
- $(MKINSTALLDIRS) $(libdir)
- $(MKINSTALLDIRS) $(includedir)
- $(MKINSTALLDIRS) @T1LIB_DATA_DIR@
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
+ $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@
+ $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_CONFIG_DIR@
$(LIBTOOL) --mode=install \
- $(INSTALL_DATA) $(MAIN_TARGET) $(libdir)
+ $(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir)
$(LIBTOOL) --mode=install \
- $(INSTALL_DATA) $(MAIN_HEADER) $(includedir)
- if (test -f @T1LIB_DATA_DIR@/t1lib.config) \
+ $(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir)
+ 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 @T1LIB_DATA_DIR@; \
+ $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_CONFIG_DIR@; \
fi;
--- t1lib-5.0.0/lib/t1lib.config.install 1999-02-23 17:50:14.000000000 +0100
+++ t1lib-5.0.0/lib/t1lib.config 2003-10-09 14:24:10.000000000 +0200
@@ -3,6 +3,7 @@
For information on how to set up these things see the t1lib-manual.
-ENCODING=.
-AFM=.
-TYPE1=.
+ENCODING=/etc/t1lib/enc
+AFM=/usr/share/fonts/Type1/afm
+TYPE1=/usr/share/fonts/Type1
+FONTDATABASE=/etc/t1lib/FontDatabase
--- t1lib-5.0.0/type1afm/Makefile.in.install 2001-01-15 23:08:23.000000000 +0100
+++ t1lib-5.0.0/type1afm/Makefile.in 2003-10-09 14:20:21.000000000 +0200
@@ -87,9 +87,9 @@
-rmdir .libs
install: dummy
- $(MKINSTALLDIRS) $(bindir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
$(LIBTOOL) --mode=install \
- $(INSTALL_PROGRAM) type1afm $(bindir)/type1afm
+ $(INSTALL_PROGRAM) type1afm $(DESTDIR)$(bindir)/type1afm
uninstall: dummy
--- t1lib-5.0.0/Makefile.in.install 2001-01-15 23:37:11.000000000 +0100
+++ t1lib-5.0.0/Makefile.in 2003-10-09 14:20:21.000000000 +0200
@@ -105,7 +105,7 @@
install: dummy
- for i in $(ALLSUBDIRS) $(DOCSUBDIRS); do \
+ for i in $(ALLSUBDIRS); do \
(cd $$i; $(MAKE) install) || exit 1; \
done
--- t1lib-5.0.0/configure.in.install 2003-03-03 01:09:25.000000000 +0100
+++ t1lib-5.0.0/configure.in 2003-10-09 14:20:21.000000000 +0200
@@ -69,6 +69,7 @@
test -z "$LDFLAGS" AC_SUBST(LDFLAGS)
T1LIB_DATA_DIR="${datadir}/t1lib"
+T1LIB_CONFIG_DIR="${sysconfdir}/t1lib"
dnl The following variables should be used
@@ -76,6 +77,7 @@
AC_SUBST(T1LIB_LT_REVISION)
AC_SUBST(T1LIB_LT_AGE)
AC_SUBST(T1LIB_DATA_DIR)
+AC_SUBST(T1LIB_CONFIG_DIR)
AC_SUBST(T1LIB_IDENTIFIER)
AC_SUBST(MAIN_TARGET)
AC_SUBST(MAIN_HEADER)
@@ -216,7 +218,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 ****