From aefb2c41c85f1b615e922c636bc7ac1eeb9e535c Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 1 Aug 2002 15:57:26 +0000
Subject: [PATCH] Fix autoconf build BSD install and sysconfdir problems

---
 ChangeLog              | 17 +++++++++++++++++
 Makefile.in            | 10 +++++-----
 config.h.in            |  3 +++
 config/Makedefs.in     |  5 +++--
 configure.in           | 14 +++++++++++++-
 fc-cache/Makefile.in   |  4 ++--
 fc-list/Makefile.in    |  4 ++--
 fontconfig/Makefile.in |  8 ++++----
 src/Makefile.in        |  2 +-
 9 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e69de29..5decb0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/Makefile.in b/Makefile.in
index f1ed990..bfb24c8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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.
 #
@@ -71,11 +71,11 @@ $(DESTDIR)$(CONFDIR)/fonts.conf:: fonts.conf
 	if [ -f $@ ]; then \
 		echo "Not overwriting existing $@"; \
 	else \
-		$(INSTALL_DATA) fonts.conf $(DESTDIR)$(CONFDIR); \
+		$(INSTALL_DATA) fonts.conf $(DESTDIR)$(CONFDIR)/fonts.conf; \
 	fi
 
 $(DESTDIR)$(CONFDIR)/fonts.dtd:: fonts.dtd
-	$(INSTALL_DATA) fonts.dtd $(DESTDIR)$(CONFDIR)
+	$(INSTALL_DATA) fonts.dtd $(DESTDIR)$(CONFDIR)/fonts.dtd
 
 #
 # install fontconfig-config script
@@ -84,7 +84,7 @@ $(DESTDIR)$(CONFDIR)/fonts.dtd:: fonts.dtd
 install:: $(DESTDIR)$(BINDIR)/fontconfig-config
 
 $(DESTDIR)$(BINDIR)/fontconfig-config: fontconfig-config
-	$(INSTALL_SCRIPT) $< $(DESTDIR)$(BINDIR)
+	$(INSTALL_SCRIPT) $< $(DESTDIR)$(BINDIR)/$<
 
 #
 # install pkgconfig control file
@@ -92,4 +92,4 @@ $(DESTDIR)$(BINDIR)/fontconfig-config: fontconfig-config
 install:: $(DESTDIR)$(LIBDIR)/pkgconfig/fontconfig.pc
 
 $(DESTDIR)$(LIBDIR)/pkgconfig/fontconfig.pc: fontconfig.pc
-	$(INSTALL_DATA) $< $(DESTDIR)$(LIBDIR)/pkgconfig
+	$(INSTALL_DATA) $< $(DESTDIR)$(LIBDIR)/pkgconfig/$<
diff --git a/config.h.in b/config.h.in
index be68fa2..9e226b0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -142,3 +142,6 @@
 
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
+
+/* Define to the directory containing font configuration files */
+#undef FONTCONFIG_PATH
diff --git a/config/Makedefs.in b/config/Makedefs.in
index 1d7d7a1..f3603f7 100644
--- a/config/Makedefs.in
+++ b/config/Makedefs.in
@@ -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.
 #
@@ -54,13 +54,14 @@ LN_S=@LN_S@
 
 X_FONT_DIR=@X_FONT_DIR@
 FC_DEFAULT_FONTS=@FC_DEFAULT_FONTS@
+FONTCONFIG_PATH=@FONTCONFIG_PATH@
 
 # shared libraries
 LIBDIR=$(libdir)
 # programs
 BINDIR=$(bindir)
 # font configuration files
-CONFDIR=$(sysconfdir)/fonts
+CONFDIR=@CONFDIR@
 # include files
 INCLUDEDIR=$(includedir)/fontconfig
 
diff --git a/configure.in b/configure.in
index 93b625c..325ff9a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 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 Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
 dnl
@@ -206,6 +206,18 @@ esac
 
 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
 #
diff --git a/fc-cache/Makefile.in b/fc-cache/Makefile.in
index a7aaf60..12a9e8a 100644
--- a/fc-cache/Makefile.in
+++ b/fc-cache/Makefile.in
@@ -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.
 #
@@ -47,7 +47,7 @@ $(DESTDIR)$(BINDIR):
 install:: $(DESTDIR)$(BINDIR)/$(PROG)
 
 $(DESTDIR)$(BINDIR)/$(PROG): $(PROG)
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR)
+	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR)/$<
 
 clean::
 	rm -f $(PROG) $(OBJS)
diff --git a/fc-list/Makefile.in b/fc-list/Makefile.in
index 8088bb3..b056e0f 100644
--- a/fc-list/Makefile.in
+++ b/fc-list/Makefile.in
@@ -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.
 #
@@ -47,7 +47,7 @@ $(DESTDIR)$(BINDIR):
 install:: $(DESTDIR)$(BINDIR)/$(PROG)
 
 $(DESTDIR)$(BINDIR)/$(PROG): $(PROG)
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR)
+	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR)/$<
 
 clean::
 	rm -f $(PROG) $(OBJS)
diff --git a/fontconfig/Makefile.in b/fontconfig/Makefile.in
index a4e7bbb..a84d4b2 100644
--- a/fontconfig/Makefile.in
+++ b/fontconfig/Makefile.in
@@ -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.
 #
@@ -37,12 +37,12 @@ $(DESTDIR)$(INCLUDEDIR):
 	mkdir -p $@
 
 $(DESTDIR)$(INCLUDEDIR)/fcfreetype.h: fcfreetype.h
-	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)/$<
 	
 $(DESTDIR)$(INCLUDEDIR)/fcprivate.h: fcprivate.h
-	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)/$<
 	
 $(DESTDIR)$(INCLUDEDIR)/fontconfig.h: fontconfig.h
-	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)/$<
 
 clean::
diff --git a/src/Makefile.in b/src/Makefile.in
index fc54578..7adeefa 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -106,7 +106,7 @@ install:: $(DESTDIR)$(LIBDIR)/$(LIB) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
 install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE)
 
 $(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE)
-	$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)
+	$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)/$<
 
 $(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
 	rm -f $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)