More autoconf cleanup for fontconfig

[fontconfig.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d9d1014b293bf074e1ff31761e8dadb05c85e029..3d7d8cdc5a27adada674ff3208cec50c3e3c5f11 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,11 +22,9 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-TOPDIR=.
+DEPTH         = .
 
-include $(TOPDIR)/config/Makedefs
-
-DIRS          = src fc-cache fc-list
+DIRS          = src fc-cache fc-list fontconfig
 
 all install clean::
        for d in $(DIRS); do $(MAKE) -C $$d $@; done
@@ -35,7 +33,7 @@ all:: fonts.conf
 
 fonts.conf: fonts.conf.in
        rm -f $@
-       sh ./setfontdirs /usr/share/fonts $(FONTDIR)
+       sh ./setfontdirs $(FC_DEFAULT_FONTS) $(X_FONT_DIR)
 
 install:: $(CONFDIR)/fonts.conf $(CONFDIR)/fonts.dtd