Fix autoconf build BSD install and sysconfdir problems

[fontconfig.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e14e75c69a691c6bfb73c743ddcfbd1e87330d7a..bfb24c86afea6400f79fd0bf167629e20d146633 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# $XFree86: xc/lib/fontconfig/Makefile.in,v 1.4 2002/05/24 05:19:30 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.
 #
@@ -29,7 +29,7 @@ include $(TOPDIR)/config/Makedefs
 DIRS          = src fc-cache fc-list fontconfig
 
 all install clean::
-       for d in $(DIRS); do $(MAKE) -C $$d $@; done
+       for d in $(DIRS); do (cd $$d && $(MAKE) $@); done
 
 #
 # create fonts.conf file
@@ -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/$<