File font-misc-ethiopic.diff of Package xorg-x11-fonts
--- Makefile.am.orig 2007-02-12 14:12:27.228324571 +0100 +++ Makefile.am 2007-02-12 14:14:24.701315546 +0100 @@ -19,20 +19,12 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -ttffontdir = @TTFFONTDIR@ -ttffont_DATA = GohaTibebZemen.ttf - otffontdir = @OTFFONTDIR@ otffont_DATA = GohaTibebZemen.otf -EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt autogen.sh +EXTRA_DIST = $(otffont_DATA) license.txt autogen.sh install-data-hook: - @rm -f $(DESTDIR)$(ttffontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(ttffontdir) - @rm -f $(DESTDIR)$(ttffontdir)/font.dir - $(MKFONTDIR) $(DESTDIR)$(ttffontdir) - $(FCCACHE) $(DESTDIR)$(ttffontdir) @rm -f $(DESTDIR)$(otffontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(otffontdir) @rm -f $(DESTDIR)$(otffontdir)/font.dir --- Makefile.in.orig 2007-02-12 14:14:31.183432175 +0100 +++ Makefile.in 2007-02-12 14:16:53.405050524 +0100 @@ -116,19 +116,16 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -ttffontdir = @TTFFONTDIR@ -ttffont_DATA = GohaTibebZemen.ttf - otffontdir = @OTFFONTDIR@ otffont_DATA = GohaTibebZemen.otf -EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt autogen.sh +EXTRA_DIST = $(otffont_DATA) license.txt autogen.sh subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = -DATA = $(otffont_DATA) $(ttffont_DATA) +DATA = $(otffont_DATA) DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 configure \ @@ -171,24 +168,6 @@ echo " rm -f $(DESTDIR)$(otffontdir)/$$f"; \ rm -f $(DESTDIR)$(otffontdir)/$$f; \ done -ttffontDATA_INSTALL = $(INSTALL_DATA) -install-ttffontDATA: $(ttffont_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(ttffontdir) - @list='$(ttffont_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(ttffontDATA_INSTALL) $$d$$p $(DESTDIR)$(ttffontdir)/$$f"; \ - $(ttffontDATA_INSTALL) $$d$$p $(DESTDIR)$(ttffontdir)/$$f; \ - done - -uninstall-ttffontDATA: - @$(NORMAL_UNINSTALL) - @list='$(ttffont_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(ttffontdir)/$$f"; \ - rm -f $(DESTDIR)$(ttffontdir)/$$f; \ - done tags: TAGS TAGS: @@ -308,7 +287,7 @@ all-am: Makefile $(DATA) installdirs: - $(mkinstalldirs) $(DESTDIR)$(otffontdir) $(DESTDIR)$(ttffontdir) + $(mkinstalldirs) $(DESTDIR)$(otffontdir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -350,7 +329,7 @@ info-am: -install-data-am: install-otffontDATA install-ttffontDATA +install-data-am: install-otffontDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -380,8 +359,7 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-otffontDATA \ - uninstall-ttffontDATA +uninstall-am: uninstall-info-am uninstall-otffontDATA .PHONY: all all-am check check-am clean clean-generic dist dist-all \ dist-bzip2 dist-gzip distcheck distclean distclean-generic \ @@ -389,18 +367,13 @@ info-am install install-am install-data install-data-am \ install-exec install-exec-am install-info install-info-am \ install-man install-otffontDATA install-strip \ - install-ttffontDATA installcheck installcheck-am installdirs \ + installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-otffontDATA uninstall-ttffontDATA + uninstall-info-am uninstall-otffontDATA install-data-hook: - @rm -f $(DESTDIR)$(ttffontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(ttffontdir) - @rm -f $(DESTDIR)$(ttffontdir)/font.dir - $(MKFONTDIR) $(DESTDIR)$(ttffontdir) - $(FCCACHE) $(DESTDIR)$(ttffontdir) @rm -f $(DESTDIR)$(otffontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(otffontdir) @rm -f $(DESTDIR)$(otffontdir)/font.dir
