--- Makefile.am.orig 2009-10-08 02:52:33.000000000 +0200 +++ Makefile.am 2010-04-04 17:46:32.000000000 +0200 @@ -19,22 +19,15 @@ # 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 # Used by RUN_FCCACHE fontdir = $(ttffontdir) $(otffontdir) -EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt +EXTRA_DIST = $(otffont_DATA) license.txt install-data-hook: - @rm -f $(DESTDIR)$(ttffontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(ttffontdir) - @rm -f $(DESTDIR)$(ttffontdir)/font.dir - $(MKFONTDIR) $(DESTDIR)$(ttffontdir) @rm -f $(DESTDIR)$(otffontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(otffontdir) @rm -f $(DESTDIR)$(otffontdir)/font.dir --- Makefile.in.orig 2009-10-11 03:22:05.000000000 +0200 +++ Makefile.in 2010-04-04 17:49:25.000000000 +0200 @@ -98,8 +98,8 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(otffontdir)" "$(DESTDIR)$(ttffontdir)" -DATA = $(otffont_DATA) $(ttffont_DATA) +am__installdirs = "$(DESTDIR)$(otffontdir)" +DATA = $(otffont_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -228,14 +228,12 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ttffontdir = @TTFFONTDIR@ -ttffont_DATA = GohaTibebZemen.ttf otffontdir = @OTFFONTDIR@ otffont_DATA = GohaTibebZemen.otf # Used by RUN_FCCACHE -fontdir = $(ttffontdir) $(otffontdir) -EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt ChangeLog +fontdir = $(otffontdir) +EXTRA_DIST = $(otffont_DATA) license.txt ChangeLog MAINTAINERCLEANFILES = ChangeLog all: all-am @@ -294,26 +292,7 @@ test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(otffontdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(otffontdir)" && rm -f $$files -install-ttffontDATA: $(ttffont_DATA) - @$(NORMAL_INSTALL) - test -z "$(ttffontdir)" || $(MKDIR_P) "$(DESTDIR)$(ttffontdir)" - @list='$(ttffont_DATA)'; test -n "$(ttffontdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ttffontdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(ttffontdir)" || exit $$?; \ - done -uninstall-ttffontDATA: - @$(NORMAL_UNINSTALL) - @list='$(ttffont_DATA)'; test -n "$(ttffontdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(ttffontdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(ttffontdir)" && rm -f $$files tags: TAGS TAGS: @@ -465,7 +444,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(otffontdir)" "$(DESTDIR)$(ttffontdir)"; do \ + for dir in "$(DESTDIR)$(otffontdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -515,7 +494,7 @@ info-am: -install-data-am: install-otffontDATA install-ttffontDATA +install-data-am: install-otffontDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am @@ -562,7 +541,7 @@ ps-am: -uninstall-am: uninstall-otffontDATA uninstall-ttffontDATA +uninstall-am: uninstall-otffontDATA .MAKE: install-am install-data-am install-strip @@ -575,18 +554,13 @@ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-otffontDATA install-pdf install-pdf-am install-ps \ - install-ps-am install-strip install-ttffontDATA installcheck \ + install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-otffontDATA \ - uninstall-ttffontDATA + pdf-am ps ps-am uninstall uninstall-am uninstall-otffontDATA install-data-hook: - @rm -f $(DESTDIR)$(ttffontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(ttffontdir) - @rm -f $(DESTDIR)$(ttffontdir)/font.dir - $(MKFONTDIR) $(DESTDIR)$(ttffontdir) @rm -f $(DESTDIR)$(otffontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(otffontdir) @rm -f $(DESTDIR)$(otffontdir)/font.dir