[Tux4kids-commits] r258 - in tuxtype/trunk: . tuxtype/data/fonts

[dbruce-guest at alioth.debian.org]

Author: dbruce-guest
Date: 2007-09-18 03:02:09 +0000 (Tue, 18 Sep 2007)
New Revision: 258

Modified:
   tuxtype/trunk/AUTHORS
   tuxtype/trunk/Makefile.am
   tuxtype/trunk/tuxtype/data/fonts/Makefile.am
Log:
"make dist" no longer includes fonts - added new Makefile target, "make dist_with_fonts" that does include them.


Modified: tuxtype/trunk/AUTHORS
===================================================================
--- tuxtype/trunk/AUTHORS	2007-09-17 13:53:41 UTC (rev 257)
+++ tuxtype/trunk/AUTHORS	2007-09-18 03:02:09 UTC (rev 258)
@@ -34,9 +34,9 @@
 Vimal Ravi <vimal_ravi at rediff.com> - (for Indic language support)
 Prince K. Antony <prince.kantony at gmail.com> - (for Indic language support)
 Mobin Mohan <mobinmohan at gmail.com> - (for Indic language support)
+Ralf Wildenhues <Ralf.Wildenhues at gmx.de> - (for Autotools help via mailing lists)
 
 
-
 Note: ConvertUTF.c/.h are from Unicode, Inc. and are released under a very free (BSD-like) license:
 
    "Unicode, Inc. hereby grants the right to freely use the information

Modified: tuxtype/trunk/Makefile.am
===================================================================
--- tuxtype/trunk/Makefile.am	2007-09-17 13:53:41 UTC (rev 257)
+++ tuxtype/trunk/Makefile.am	2007-09-18 03:02:09 UTC (rev 258)
@@ -69,6 +69,11 @@
 
 #	cp $(NSI_DLL_DIR)/*.ttf $(top_srcdir)/$(NSI_INSTALL_DIR)/data/fonts ;
 
+## Bundle in fonts for distribution tar.gz to be used without package manager:
+## i.e. to make tarball to post for individual download - use 'make distcheck' for Debian.
+## (thanks to Ralf Wildenhues <Ralf.Wildenhues at gmx.de> for automake help!)
+dist_with_fonts:
+	$(MAKE) $(AM_MAKEFLAGS) dist dist_fonts='AndikaDesRevG.ttf DoulosSILR.ttf Rachana_w01.ttf'
 
 install-nsi-am: install-nsi-local
 

Modified: tuxtype/trunk/tuxtype/data/fonts/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/fonts/Makefile.am	2007-09-17 13:53:41 UTC (rev 257)
+++ tuxtype/trunk/tuxtype/data/fonts/Makefile.am	2007-09-18 03:02:09 UTC (rev 258)
@@ -1,10 +1,17 @@
-EXTRA_DIST = AndikaDesRevG.ttf DoulosSILR.ttf Rachana_w01.ttf
+## Process with Automake to create Makefile.in
 
+## Support building with or without bundled fonts:
+## (see also 'dist_with_fonts' target in top-level Makefile.am)
+EXTRA_DIST = $(dist_fonts)
+
+
+## The INSTALL_DATA lines are prefixed with '-' because the fonts may or may not be
+## included (depending if package build with "make dist" or "make dist_with_fonts"
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
-	$(INSTALL_DATA) $(srcdir)/AndikaDesRevG.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
-	$(INSTALL_DATA) $(srcdir)/DoulosSILR.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
-	$(INSTALL_DATA) $(srcdir)/Rachana_w01.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
+	-$(INSTALL_DATA) $(srcdir)/AndikaDesRevG.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
+	-$(INSTALL_DATA) $(srcdir)/DoulosSILR.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
+	-$(INSTALL_DATA) $(srcdir)/Rachana_w01.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
 
 uninstall-local:
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/AndikaDesRevG.ttf