+++ /dev/null
-diff -Nru freetype-1.3/contrib/ttf2bdf/Makefile.in freetype-1.3.new/contrib/ttf2bdf/Makefile.in
---- freetype-1.3/contrib/ttf2bdf/Makefile.in Sun Dec 6 19:50:22 1998
-+++ freetype-1.3.new/contrib/ttf2bdf/Makefile.in Wed Oct 27 08:40:04 1999
-@@ -63,9 +63,9 @@
- $(CC) $(CFLAGS) $(INCS) -c $< -o $@
-
- install: ttf2bdf
-- @$(MKINSTALLDIRS) $(bindir) $(mandir)/man1
-- @cp ttf2bdf $(bindir)/ttf2bdf
-- @cp ttf2bdf.man $(mandir)/man1/ttf2bdf.1
-+ @$(MKINSTALLDIRS) $(bindir) $(DESTDIR)$(mandir)/man1
-+ @cp ttf2bdf $(DESTDIR)$(bindir)/ttf2bdf
-+ @cp ttf2bdf.man $(DESTDIR)$(mandir)/man1/ttf2bdf.1
-
- uninstall:
- @$(RM) -f $(bindir)/ttf2bdf
-diff -Nru freetype-1.3/contrib/ttf2pfb/Makefile.in freetype-1.3.new/contrib/ttf2pfb/Makefile.in
---- freetype-1.3/contrib/ttf2pfb/Makefile.in Wed May 5 06:48:16 1999
-+++ freetype-1.3.new/contrib/ttf2pfb/Makefile.in Wed Oct 27 08:40:33 1999
-@@ -58,11 +58,11 @@
- $(CC) -c $(FT_CFLAGS) $<
-
- install: $(PROGRAMS)
-- $(MKINSTALLDIRS) $(bindir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
- for P in $(PROGRAMS) ; do \
-- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$P $(bindir)/$$P ; \
-+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$P $(DESTDIR)$(bindir)/$$P ; \
- done
-- $(INSTALL_PROGRAM) $(srcdir)/getafm $(bindir)/getafm
-+ $(INSTALL_PROGRAM) $(srcdir)/getafm $(DESTDIR)$(bindir)/getafm
-
- uninstall:
- -for P in $(PROGRAMS) ; do \
-diff -Nru freetype-1.3/contrib/ttf2pk/Makefile.in freetype-1.3.new/contrib/ttf2pk/Makefile.in
---- freetype-1.3/contrib/ttf2pk/Makefile.in Thu Sep 3 07:12:57 1998
-+++ freetype-1.3.new/contrib/ttf2pk/Makefile.in Wed Oct 27 08:40:58 1999
-@@ -69,10 +69,10 @@
- $(LIBDIR)/libttf.la $(LDFLAGS)
-
- install: $(PROGRAMS)
-- $(MKINSTALLDIRS) $(bindir) $(mandir)/man1
-+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
- for P in $(PROGRAMS) ; do \
-- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$P $(bindir)/$$P ; \
-- $(INSTALL_DATA) $(srcdir)/$$P.1 $(mandir)/man1 ; \
-+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$P $(DESTDIR)$(bindir)/$$P ; \
-+ $(INSTALL_DATA) $(srcdir)/$$P.1 $(DESTDIR)$(mandir)/man1 ; \
- done
-
- uninstall:
-diff -Nru freetype-1.3/contrib/ttfbanner/Makefile.in freetype-1.3.new/contrib/ttfbanner/Makefile.in
---- freetype-1.3/contrib/ttfbanner/Makefile.in Wed Dec 30 18:54:37 1998
-+++ freetype-1.3.new/contrib/ttfbanner/Makefile.in Wed Oct 27 08:41:18 1999
-@@ -53,8 +53,8 @@
- $(CC) -c $(FT_CFLAGS) $<
-
- install: ttfbanner
-- $(MKINSTALLDIRS) $(bindir)
-- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ttfbanner $(bindir)/
-+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
-+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ttfbanner $(DESTDIR)$(bindir)/
-
- uninstall:
- $(LIBTOOL) --mode=uninstall $(RM) $(bindir)/ttfbanner
-diff -Nru freetype-1.3/lib/arch/unix/Makefile.in freetype-1.3.new/lib/arch/unix/Makefile.in
---- freetype-1.3/lib/arch/unix/Makefile.in Sat Jul 31 08:48:17 1999
-+++ freetype-1.3.new/lib/arch/unix/Makefile.in Wed Oct 27 08:55:09 1999
-@@ -200,10 +200,10 @@
- -version-info $(version_info) $(FT_LIBS)
-
- install: libttf.la
-- $(MKINSTALLDIRS) $(libdir) $(includedir)/freetype
-- $(LIBTOOL) --mode=install $(INSTALL) libttf.la $(libdir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/freetype
-+ $(LIBTOOL) --mode=install $(INSTALL) libttf.la $(DESTDIR)$(libdir)
- -for P in $(HEADERS) ; do \
-- $(INSTALL_DATA) $$P $(includedir)/freetype ; \
-+ $(INSTALL_DATA) $$P $(DESTDIR)$(includedir)/freetype ; \
- done
-
- uninstall:
-diff -Nru freetype-1.3/test/arch/unix/Makefile.in freetype-1.3.new/test/arch/unix/Makefile.in
---- freetype-1.3/test/arch/unix/Makefile.in Mon Jun 28 21:52:08 1999
-+++ freetype-1.3.new/test/arch/unix/Makefile.in Wed Oct 27 09:04:53 1999
-@@ -125,9 +125,9 @@
-
-
- install: $(PROGRAMS)
-- $(MKINSTALLDIRS) $(bindir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
- for P in $(PROGRAMS) ; do \
-- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$P $(bindir)/$$P ; \
-+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$P $(DESTDIR)$(bindir)/$$P ; \
- done
-
- uninstall:
+++ /dev/null
-diff -urN freetype-1.3.1.org/configure.in freetype-1.3.1/configure.in
---- freetype-1.3.1.org/configure.in Fri Apr 12 13:38:29 2002
-+++ freetype-1.3.1/configure.in Fri Apr 12 13:38:43 2002
-@@ -4,6 +4,8 @@
-
- AC_INIT(lib/freetype.h)
-
-+AM_INIT_AUTOMAKE(freetype, 1.3.1)
-+
- dnl Due to a bug in autoconf we must set $srcdir explicitly to an absolute
- dnl path.
- srcdir=`cd $srcdir; pwd`
-@@ -17,11 +19,6 @@
- dnl libttf.so version
- version_info='4:0:2'
-
--AC_ARG_ENABLE(nls,
-- [ --disable-nls don't use NLS],
-- USE_NLS=no, USE_NLS=yes)
--AC_SUBST(USE_NLS)
--
- dnl Checks for system type.
- AC_CANONICAL_SYSTEM
-
-@@ -57,100 +54,8 @@
- AC_SUBST(freetype_version)
- AC_SUBST(version_info)
-
--dnl gettext support
--if test "$USE_NLS" = "yes"; then
-- AC_REQUIRE([AC_PROG_MAKE_SET])
-- AC_CHECK_HEADERS(locale.h)
-- AC_CHECK_FUNCS(setlocale)
-- AC_SUBST(HAVE_LOCALE_H)
--
-- ALL_LINGUAS="de fr cs nl es"
-- AC_CHECK_HEADERS(libintl.h)
-- AC_CHECK_LIB(intl,gettext)
-- AC_SUBST(HAVE_LIBINTL_H)
-- AC_SUBST(HAVE_LIBINTL)
--
-- dnl Handle localedir
-- LOCALEDIR='${prefix}/share/locale'
-- AC_ARG_WITH(locale-dir,
-- [ --with-locale-dir=DIR Location of the locale file(s)
-- [PREFIX/share/locale]],[
-- if test x$withval = xyes; then
-- AC_MSG_WARN(Usage is: --with-locale-dir=basedir)
-- else
-- if test x$withval = xno; then
-- AC_MSG_WARN(Usage is: --with-locale-dir=basedir)
-- else
-- LOCALEDIR=$withval
-- fi
-- fi
-- ])
-- AC_SUBST(LOCALEDIR)
--
-- AC_PATH_PROG(MSGFMT, msgfmt, $MSGFMT)
-- if test -n "$MSGFMT"; then
-- AC_CHECK_FUNCS(dcgettext)
-- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-- AC_PATH_PROG(XGETTEXT, xgettext, $XGETTEXT)
-- AC_PATH_PROG(MSGMERGE, msgmerge, $MSGMERGE)
--
-- dnl Test whether we really found GNU xgettext.
-- if test -n "$XGETTEXT"; then
-- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-- : ;
-- else
-- AC_MSG_RESULT(
-- [found xgettext program is not GNU xgettext; ignore it])
-- XGETTEXT=""
-- fi
-- fi
--
-- dnl We add another test for comparing GNU xgettext with openwin xgettext
-- if test -n "$XGETTEXT"; then
-- if $XGETTEXT --help > /dev/null 2> /dev/null; then
-- : ;
-- else
-- AC_MSG_RESULT(
-- [found xgettext program is not GNU xgettext; ignore it])
-- XGETTEXT=""
-- fi
-- fi
--
-- dnl Test whether we really found GNU msgfmt.
-- if test -n "$MSGFMT"; then
-- if $MSGFMT < /dev/null 2> /dev/null; then
-- AC_MSG_RESULT(
-- [found msgfmt program is not GNU msgfmt; NLS won't be installed])
-- MSGFMT=""
-- fi
-- fi
--
-- AC_TRY_LINK(,
-- [extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr],
-- [CATOBJEXT=.gmo
-- DATADIRNAME=share],
-- [CATOBJEXT=.mo
-- DATADIRNAME=lib])
-- INSTOBJEXT=.mo
-- fi
--
-- if test -n "$ALL_LINGUAS"; then
-- for lang in $ALL_LINGUAS; do
-- CATALOGS="$CATALOGS $lang$CATOBJEXT"
-- done
-- fi
-- AC_SUBST(CATALOGS)
-- AC_SUBST(CATOBJEXT)
-- AC_SUBST(INSTOBJEXT)
-- AC_SUBST(DATADIRNAME)
--fi
--
--dnl don't use NLS, when there is no gettext installed
--if test x"$MSGFMT" = x; then
-- USE_NLS=no
--fi
--
-+ALL_LINGUAS="cs de es fr nl"
-+AM_GNU_GETTEXT
-
- AC_CHECK_PROG(RM, rm, rm)
- AC_CHECK_PROG(RMDIR, rmdir, rmdir)
-@@ -194,8 +99,7 @@
- MakeSub
- lib/arch/unix/Makefile
- test/arch/unix/Makefile
-- po/Makefile.in,
-- [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
--
-+ po/Makefile.in
-+ intl/Makefile)
-
- dnl end of configure.in
-diff -urN freetype-1.3.1.org/lib/arch/unix/Makefile.in freetype-1.3.1/lib/arch/unix/Makefile.in
---- freetype-1.3.1.org/lib/arch/unix/Makefile.in Fri Apr 12 13:38:30 2002
-+++ freetype-1.3.1/lib/arch/unix/Makefile.in Fri Apr 12 13:42:10 2002
-@@ -132,7 +132,7 @@
- FT_LIBS = @LIBS@
-
- # i18n stuff
--LOCALEDIR = @LOCALEDIR@
-+LOCALEDIR = @datadir@/locale
-
-
- all: do_link
projects / packages / freetype.git / commitdiff