Return to patch-aa CVS log | Up to [cvs.NetBSD.org] / pkgsrc / fonts / fontconfig / patches |
File: [cvs.NetBSD.org] / pkgsrc / fonts / fontconfig / patches / patch-aa (download)
Revision 1.5, Mon Jun 7 23:37:41 2004 UTC (19 years, 9 months ago) by dmcmahill
Update to 2.2.95 development release. Several bugs have been fixed, in particular this fixes a problem where no font matches can be found by gtk2 apps. This should fix the problem where even the gtk-demo program fails run. |
$NetBSD: patch-aa,v 1.5 2004/06/07 23:37:41 dmcmahill Exp $ --- Makefile.in.orig Sat May 29 19:43:19 2004 +++ Makefile.in @@ -290,12 +290,12 @@ uninstall-info-am: configDATA_INSTALL = $(INSTALL_DATA) install-configDATA: $(config_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(configdir) + $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/fontconfig @list='$(config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(configdir)/$$f"; \ - $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(configdir)/$$f; \ + echo " $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f"; \ + $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f; \ done uninstall-configDATA: @@ -680,14 +680,14 @@ uninstall-info: uninstall-info-recursive install-data-local: $(mkinstalldirs) $(DESTDIR)/$(configdir) - if [ -f $(DESTDIR)$(configdir)/local.conf ]; then \ - echo "not overwriting existing $(DESTDIR)$(configdir)/local.conf"; \ + if [ -f $(DESTDIR)$(datadir)/examples/fontconfig/local.conf ]; then \ + echo "not overwriting existing $(DESTDIR)$(datadir)/examples/fontconfig/local.conf"; \ else if [ -f $(srcdir)/local.conf ]; then \ - echo " $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf"; \ - $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf; \ + echo " $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf"; \ + $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf; \ else if [ -f local.conf ]; then \ - echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \ - $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \ + echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf"; \ + $(INSTALL_DATA) local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf; \ fi; fi; fi if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi # Tell versions [3.59,3.63) of GNU make to not export all variables.