walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix autoconf build BSD install and sysconfdir problems

This commit is contained in:
Keith Packard 2002-08-01 15:57:26 +00:00
parent c2e9d0240b
commit aefb2c41c8
9 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -0,0 +1,17 @@
Tue Jul 30 18:37:09 PDT 2002 keithp
+ Add binding property to edit element so that strong
binding values may be inserted by the config file.
The default remains weak.
Sun 28 Jul 04:16:55 PDT 2002 keithp
+ Tagged release candidate 1 in the CVS tree and
placed fcpackage.rc1.tar.gz for distribution
Thu Aug 1 08:55:08 PDT 2002 keithp
+ Fixed autoconf builds to always specify install
target files (for BSD). Also fixed to
define FONTCONFIG_PATH in config.h so that
nonstandard installs will actually work.

10
Makefile.in
View File

@ -1,5 +1,5 @@
# #
# $XFree86: xc/lib/fontconfig/Makefile.in,v 1.5 2002/05/24 06:25:51 keithp Exp $ # $XFree86: xc/lib/fontconfig/Makefile.in,v 1.6 2002/05/28 03:50:23 keithp Exp $
# #
# Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. # Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
# #
@ -71,11 +71,11 @@ $(DESTDIR)$(CONFDIR)/fonts.conf:: fonts.conf
if [ -f $@ ]; then \ if [ -f $@ ]; then \
echo "Not overwriting existing $@"; \ echo "Not overwriting existing $@"; \
else \ else \
$(INSTALL_DATA) fonts.conf $(DESTDIR)$(CONFDIR); \ $(INSTALL_DATA) fonts.conf $(DESTDIR)$(CONFDIR)/fonts.conf; \
fi fi
$(DESTDIR)$(CONFDIR)/fonts.dtd:: fonts.dtd $(DESTDIR)$(CONFDIR)/fonts.dtd:: fonts.dtd
$(INSTALL_DATA) fonts.dtd $(DESTDIR)$(CONFDIR) $(INSTALL_DATA) fonts.dtd $(DESTDIR)$(CONFDIR)/fonts.dtd
# #
# install fontconfig-config script # install fontconfig-config script
@ -84,7 +84,7 @@ $(DESTDIR)$(CONFDIR)/fonts.dtd:: fonts.dtd
install:: $(DESTDIR)$(BINDIR)/fontconfig-config install:: $(DESTDIR)$(BINDIR)/fontconfig-config
$(DESTDIR)$(BINDIR)/fontconfig-config: fontconfig-config $(DESTDIR)$(BINDIR)/fontconfig-config: fontconfig-config
$(INSTALL_SCRIPT) $< $(DESTDIR)$(BINDIR) $(INSTALL_SCRIPT) $< $(DESTDIR)$(BINDIR)/$<
# #
# install pkgconfig control file # install pkgconfig control file
@ -92,4 +92,4 @@ $(DESTDIR)$(BINDIR)/fontconfig-config: fontconfig-config
install:: $(DESTDIR)$(LIBDIR)/pkgconfig/fontconfig.pc install:: $(DESTDIR)$(LIBDIR)/pkgconfig/fontconfig.pc
$(DESTDIR)$(LIBDIR)/pkgconfig/fontconfig.pc: fontconfig.pc $(DESTDIR)$(LIBDIR)/pkgconfig/fontconfig.pc: fontconfig.pc
$(INSTALL_DATA) $< $(DESTDIR)$(LIBDIR)/pkgconfig $(INSTALL_DATA) $< $(DESTDIR)$(LIBDIR)/pkgconfig/$<

3
config.h.in
View File

@ -142,3 +142,6 @@
/* Define to `int' if <sys/types.h> does not define. */ /* Define to `int' if <sys/types.h> does not define. */
#undef pid_t #undef pid_t
/* Define to the directory containing font configuration files */
#undef FONTCONFIG_PATH

5
config/Makedefs.in
View File

@ -1,5 +1,5 @@
# #
# $XFree86: xc/lib/fontconfig/config/Makedefs.in,v 1.1 2002/05/21 17:06:21 keithp Exp $ # $XFree86: xc/lib/fontconfig/config/Makedefs.in,v 1.2 2002/05/21 17:48:15 keithp Exp $
# #
# Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. # Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
# #
@ -54,13 +54,14 @@ LN_S=@LN_S@
X_FONT_DIR=@X_FONT_DIR@ X_FONT_DIR=@X_FONT_DIR@
FC_DEFAULT_FONTS=@FC_DEFAULT_FONTS@ FC_DEFAULT_FONTS=@FC_DEFAULT_FONTS@
FONTCONFIG_PATH=@FONTCONFIG_PATH@
# shared libraries # shared libraries
LIBDIR=$(libdir) LIBDIR=$(libdir)
# programs # programs
BINDIR=$(bindir) BINDIR=$(bindir)
# font configuration files # font configuration files
CONFDIR=$(sysconfdir)/fonts CONFDIR=@CONFDIR@
# include files # include files
INCLUDEDIR=$(includedir)/fontconfig INCLUDEDIR=$(includedir)/fontconfig

14
configure.in
View File

@ -1,5 +1,5 @@
dnl dnl
dnl $XFree86: xc/lib/fontconfig/configure.in,v 1.5 2002/05/24 05:19:30 keithp Exp $ dnl $XFree86: xc/lib/fontconfig/configure.in,v 1.6 2002/06/07 17:55:41 keithp Exp $
dnl dnl
dnl Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. dnl Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
dnl dnl
@ -206,6 +206,18 @@ esac
AC_SUBST(FC_DEFAULT_FONTS) AC_SUBST(FC_DEFAULT_FONTS)
#
# Set CONFDIR and FONTCONFIG_PATH
#
CONFDIR="$sysconfdir/fonts"
AC_DEFINE_UNQUOTED(CONFDIR, "$CONFDIR")
AC_SUBST(CONFDIR)
FONTCONFIG_PATH="$CONFDIR"
AC_DEFINE_UNQUOTED(FONTCONFIG_PATH, "$CONFDIR")
AC_SUBST(FONTCONFIG_PATH)
# #
# Check expat/libxml2 configuration # Check expat/libxml2 configuration
# #

4
fc-cache/Makefile.in
View File

@ -1,5 +1,5 @@
# #
# $XFree86: xc/lib/fontconfig/fc-cache/Makefile.in,v 1.2 2002/05/21 17:48:15 keithp Exp $ # $XFree86: xc/lib/fontconfig/fc-cache/Makefile.in,v 1.3 2002/05/24 06:25:51 keithp Exp $
# #
# Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. # Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
# #
@ -47,7 +47,7 @@ $(DESTDIR)$(BINDIR):
install:: $(DESTDIR)$(BINDIR)/$(PROG) install:: $(DESTDIR)$(BINDIR)/$(PROG)
$(DESTDIR)$(BINDIR)/$(PROG): $(PROG) $(DESTDIR)$(BINDIR)/$(PROG): $(PROG)
$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR) $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR)/$<
clean:: clean::
rm -f $(PROG) $(OBJS) rm -f $(PROG) $(OBJS)

4
fc-list/Makefile.in
View File

@ -1,5 +1,5 @@
# #
# $XFree86: xc/lib/fontconfig/fc-list/Makefile.in,v 1.2 2002/05/21 17:48:15 keithp Exp $ # $XFree86: xc/lib/fontconfig/fc-list/Makefile.in,v 1.3 2002/05/24 06:25:52 keithp Exp $
# #
# Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. # Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
# #
@ -47,7 +47,7 @@ $(DESTDIR)$(BINDIR):
install:: $(DESTDIR)$(BINDIR)/$(PROG) install:: $(DESTDIR)$(BINDIR)/$(PROG)
$(DESTDIR)$(BINDIR)/$(PROG): $(PROG) $(DESTDIR)$(BINDIR)/$(PROG): $(PROG)
$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR) $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR)/$<
clean:: clean::
rm -f $(PROG) $(OBJS) rm -f $(PROG) $(OBJS)

8
fontconfig/Makefile.in
View File

@ -1,5 +1,5 @@
# #
# $XFree86: xc/lib/fontconfig/fontconfig/Makefile.in,v 1.1 2002/05/22 22:59:41 keithp Exp $ # $XFree86: xc/lib/fontconfig/fontconfig/Makefile.in,v 1.2 2002/05/24 06:25:52 keithp Exp $
# #
# Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. # Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
# #
@ -37,12 +37,12 @@ $(DESTDIR)$(INCLUDEDIR):
mkdir -p $@ mkdir -p $@
$(DESTDIR)$(INCLUDEDIR)/fcfreetype.h: fcfreetype.h $(DESTDIR)$(INCLUDEDIR)/fcfreetype.h: fcfreetype.h
$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)/$<
$(DESTDIR)$(INCLUDEDIR)/fcprivate.h: fcprivate.h $(DESTDIR)$(INCLUDEDIR)/fcprivate.h: fcprivate.h
$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)/$<
$(DESTDIR)$(INCLUDEDIR)/fontconfig.h: fontconfig.h $(DESTDIR)$(INCLUDEDIR)/fontconfig.h: fontconfig.h
$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)/$<
clean:: clean::

2
src/Makefile.in
View File

@ -106,7 +106,7 @@ install:: $(DESTDIR)$(LIBDIR)/$(LIB) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE) install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE)
$(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE)
$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)/$<
$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
rm -f $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) rm -f $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)