[Tux4kids-commits] r345 - in tuxmath/trunk: . data/fonts data/images/sprites intl nsis
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Mon Nov 26 13:11:13 UTC 2007
Author: dbruce-guest
Date: 2007-11-26 13:11:13 +0000 (Mon, 26 Nov 2007)
New Revision: 345
Modified:
tuxmath/trunk/Makefile.am
tuxmath/trunk/data/fonts/Makefile.am
tuxmath/trunk/data/images/sprites/Makefile
tuxmath/trunk/intl/localename.c
tuxmath/trunk/nsis/tuxmath.nsi
tuxmath/trunk/nsis/tuxmath.nsi.in
tuxmath/trunk/nsis/tuxmath_with_conf.nsi
Log:
Work on win32 crossbuild
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2007-11-26 06:57:34 UTC (rev 344)
+++ tuxmath/trunk/Makefile.am 2007-11-26 13:11:13 UTC (rev 345)
@@ -13,38 +13,46 @@
localedir = $(datadir)/locale
-
+## These are defined in configure.ac:
MAKENSIS=@NSIS@
NSI_INSTALL_DIR=@NSI_INSTALL_DIR@
NSI_DLL_DIR=@NSI_DLL_DIR@
NSI_TUXMATH_CONF_DIR=@NSI_TUXMATH_CONF_DIR@
+NSI_TEMP_INSTALL_DIR=$(abs_top_builddir)/inst_w32
## 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_fonts' is in EXTRA_DATA but is empty by default. With this target,
+## 'dist_fonts' gets set to a list of the font files in data/fonts before making
+## 'dist', causing the fonts to be included in the tar.gz.
dist_with_fonts:
- $(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) dist_fonts='AndikaDesRevG.ttf' dist
+ $(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) \
+ dist_fonts=$(data_fonts) dist
-install-data-local:
- $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)
-uninstall-local:
- rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)
+## FIXME make better use of autotools here:
+## $(MAKE) $(AM_MAKEFLAGS) \
+## datarootdir=$(top_srcdir)/$(NSI_INSTALL_DIR) install-data
-
-## FIXME make better use of autotools here:
install-nsi-local: all
- $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR);
- (cd $(top_srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude \ "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" --exclude "*.svn*" * ) \
- | ( cd $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR) ; tar xf -) ; \
- cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR) ;
- cp $(top_srcdir)/src/TuxMath.exe $(top_srcdir)/$(NSI_INSTALL_DIR) ;
+ $(INSTALL) -d $(NSI_TEMP_INSTALL_DIR)
+ $(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(NSI_TEMP_INSTALL_DIR) install
-if NSI_USE_TUXMATH_CONF
- $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
- cp $(NSI_TUXMATH_CONF_DIR)/*.* $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
-endif
+##install-nsi-local: all
+## $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/data;
+## (cd $(top_srcdir)/$(PACKAGE_DATA_DIR) ; \
+## tar cf - --exclude "Makefile*" --exclude "*~" --exclude "*.svn*" * ) \
+## | ( cd $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR); \
+## tar xf -);
+## cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR);
+## cp src/TuxMath.exe $(top_srcdir)/$(NSI_INSTALL_DIR);
+##
+##if NSI_USE_TUXMATH_CONF
+## $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
+## cp $(NSI_TUXMATH_CONF_DIR)/*.* $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
+##endif
install-nsi-am: install-nsi-local
Modified: tuxmath/trunk/data/fonts/Makefile.am
===================================================================
--- tuxmath/trunk/data/fonts/Makefile.am 2007-11-26 06:57:34 UTC (rev 344)
+++ tuxmath/trunk/data/fonts/Makefile.am 2007-11-26 13:11:13 UTC (rev 345)
@@ -1,5 +1,28 @@
## Makefile.am for tuxmath - data/fonts:
+## A little explanation - these variables allow building of the dist tarball
+## either without the fonts ("make dist") or with the fonts ("make dist_with_fonts"),
+## see also top level Makefile.am.
+## 'data_fonts' is a list of the font files in this directory.
+## 'dist_fonts' determines what fonts get bundled in. It is empty by default,
+## but gets set to 'data_fonts' in the "make dist_with_fonts" target in the
+## top-level Makefile.am.
+
+EXTRA_DIST = $(dist_fonts)
+data_fonts = AndikaDesRevG.ttf
+
+
+## Handle install "manually" because otherwise it fails on package without fonts.
+## The INSTALL_DATA lines are prefixed with '-' because the fonts may or may not be
+## included (depending if package built with "make dist" or "make dist_with_fonts"
+## 'fontsdir' is where the fonts are installed.
+
fontsdir = $(pkgdatadir)/fonts
-dist_fonts_DATA = $(dist_fonts)
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(fontsdir)
+ -$(INSTALL_DATA) $(srcdir)/AndikaDesRevG.ttf $(DESTDIR)$(fontsdir)
+
+uninstall-local:
+ -rm -f $(DESTDIR)$(fontsdir)/AndikaDesRevG.ttf
+ -rm -f $(DESTDIR)$(fontsdir)
\ No newline at end of file
Modified: tuxmath/trunk/data/images/sprites/Makefile
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile 2007-11-26 06:57:34 UTC (rev 344)
+++ tuxmath/trunk/data/images/sprites/Makefile 2007-11-26 13:11:13 UTC (rev 345)
@@ -14,6 +14,7 @@
+
pkgdatadir = $(datadir)/tuxmath
pkglibdir = $(libdir)/tuxmath
pkgincludedir = $(includedir)/tuxmath
@@ -33,13 +34,15 @@
host_triplet = i586-pc-mingw32msvc
target_triplet = i586-pc-mingw32msvc
subdir = data/images/sprites
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_sprites_DATA) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+ $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intmax.m4 \
+ $(top_srcdir)/m4/inttypes-pri.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
@@ -53,11 +56,20 @@
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(spritesdir)"
+dist_spritesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_sprites_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run aclocal-1.10
ALLOCA =
@@ -124,7 +136,7 @@
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
MSGMERGE = /usr/bin/msgmerge
-NAME_VERSION = tuxmath-1.5.7
+NAME_VERSION = tuxmath-1.5.8
NSIS = /usr/bin/makensis
NSI_DLL_DIR = /home/dbruce/tuxmath_dll
NSI_INSTALL_DIR = mingw32
@@ -134,9 +146,9 @@
PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
PACKAGE_DATA_DIR = data
PACKAGE_NAME = Tux Of Math Command
-PACKAGE_STRING = Tux Of Math Command 1.5.7
+PACKAGE_STRING = Tux Of Math Command 1.5.8
PACKAGE_TARNAME = tuxmath
-PACKAGE_VERSION = 1.5.7
+PACKAGE_VERSION = 1.5.8
PATH_SEPARATOR = :
POSUB = po
POW_LIB =
@@ -150,7 +162,7 @@
STRIP = i586-mingw32msvc-strip
USE_INCLUDED_LIBINTL = yes
USE_NLS = yes
-VERSION = 1.5.7
+VERSION = 1.5.8
WINDRES = /usr/bin/i586-mingw32msvc-windres
WOE32DLL = no
XGETTEXT = /usr/bin/xgettext
@@ -208,89 +220,90 @@
target_vendor = pc
top_builddir = ../../..
top_srcdir = ../../..
-EXTRA_DIST = comet0.png \
- comet1.png \
- comet2.png \
- comet3.png \
- comet4.png \
- comet5.png \
- cometd.png \
- credits0.png \
- credits1.png \
- credits2.png \
- credits3.png \
- creditsd.png \
- goldstard.png \
- goldstar0.png \
- goldstar1.png \
- help0.png \
- help1.png \
- help2.png \
- help3.png \
- helpd.png \
- lesson0.png \
- lesson1.png \
- lesson2.png \
- lesson3.png \
- lessond.png \
- main0.png \
- main1.png \
- main2.png \
- main3.png \
- main4.png \
- main5.png \
- main6.png \
- main7.png \
- maind.png \
- quit0.png \
- no_goldstar0.png \
- no_goldstard.png \
- quit1.png \
- quit2.png \
- quit3.png \
- quit4.png \
- quit5.png \
- quit6.png \
- quit7.png \
- quit8.png \
- quitd.png \
- trophy0.png \
- trophy1.png \
- trophyd.png \
- tux_config0.png \
- tux_config1.png \
- tux_config_brown0.png \
- tux_config_brown1.png \
- tux_config_brownd.png \
- tux_configd.png \
- tux_helmet_blue0.png \
- tux_helmet_blue1.png \
- tux_helmet_blue2.png \
- tux_helmet_blue3.png \
- tux_helmet_blue4.png \
- tux_helmet_blue5.png \
- tux_helmet_blued.png \
- tux_helmet_green0.png \
- tux_helmet_green1.png \
- tux_helmet_green2.png \
- tux_helmet_green3.png \
- tux_helmet_green4.png \
- tux_helmet_green5.png \
- tux_helmet_greend.png \
- tux_helmet_red0.png \
- tux_helmet_red1.png \
- tux_helmet_red2.png \
- tux_helmet_red3.png \
- tux_helmet_red4.png \
- tux_helmet_red5.png \
- tux_helmet_redd.png \
- tux_helmet_yellow0.png \
- tux_helmet_yellow1.png \
- tux_helmet_yellow2.png \
- tux_helmet_yellow3.png \
- tux_helmet_yellow4.png \
- tux_helmet_yellow5.png \
- tux_helmet_yellowd.png
+spritesdir = $(pkgdatadir)/images/sprites
+dist_sprites_DATA = comet0.png \
+ comet1.png \
+ comet2.png \
+ comet3.png \
+ comet4.png \
+ comet5.png \
+ cometd.png \
+ credits0.png \
+ credits1.png \
+ credits2.png \
+ credits3.png \
+ creditsd.png \
+ goldstard.png \
+ goldstar0.png \
+ goldstar1.png \
+ help0.png \
+ help1.png \
+ help2.png \
+ help3.png \
+ helpd.png \
+ lesson0.png \
+ lesson1.png \
+ lesson2.png \
+ lesson3.png \
+ lessond.png \
+ main0.png \
+ main1.png \
+ main2.png \
+ main3.png \
+ main4.png \
+ main5.png \
+ main6.png \
+ main7.png \
+ maind.png \
+ quit0.png \
+ no_goldstar0.png \
+ no_goldstard.png \
+ quit1.png \
+ quit2.png \
+ quit3.png \
+ quit4.png \
+ quit5.png \
+ quit6.png \
+ quit7.png \
+ quit8.png \
+ quitd.png \
+ trophy0.png \
+ trophy1.png \
+ trophyd.png \
+ tux_config0.png \
+ tux_config1.png \
+ tux_config_brown0.png \
+ tux_config_brown1.png \
+ tux_config_brownd.png \
+ tux_configd.png \
+ tux_helmet_blue0.png \
+ tux_helmet_blue1.png \
+ tux_helmet_blue2.png \
+ tux_helmet_blue3.png \
+ tux_helmet_blue4.png \
+ tux_helmet_blue5.png \
+ tux_helmet_blued.png \
+ tux_helmet_green0.png \
+ tux_helmet_green1.png \
+ tux_helmet_green2.png \
+ tux_helmet_green3.png \
+ tux_helmet_green4.png \
+ tux_helmet_green5.png \
+ tux_helmet_greend.png \
+ tux_helmet_red0.png \
+ tux_helmet_red1.png \
+ tux_helmet_red2.png \
+ tux_helmet_red3.png \
+ tux_helmet_red4.png \
+ tux_helmet_red5.png \
+ tux_helmet_redd.png \
+ tux_helmet_yellow0.png \
+ tux_helmet_yellow1.png \
+ tux_helmet_yellow2.png \
+ tux_helmet_yellow3.png \
+ tux_helmet_yellow4.png \
+ tux_helmet_yellow5.png \
+ tux_helmet_yellowd.png
all: all-am
@@ -324,6 +337,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_spritesDATA: $(dist_sprites_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(spritesdir)" || $(MKDIR_P) "$(DESTDIR)$(spritesdir)"
+ @list='$(dist_sprites_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(dist_spritesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(spritesdir)/$$f'"; \
+ $(dist_spritesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(spritesdir)/$$f"; \
+ done
+
+uninstall-dist_spritesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_sprites_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(spritesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(spritesdir)/$$f"; \
+ done
tags: TAGS
TAGS:
@@ -359,8 +389,11 @@
done
check-am: all-am
check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
installdirs:
+ for dir in "$(DESTDIR)$(spritesdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -403,7 +436,7 @@
info-am:
-install-data-am: install-data-local
+install-data-am: install-dist_spritesDATA
install-dvi: install-dvi-am
@@ -437,192 +470,22 @@
ps-am:
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_spritesDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
- install-data-local install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ install-dist_spritesDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps 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-local
+ pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-dist_spritesDATA
-
-install-data-local:
- $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-
- $(INSTALL_DATA) $(srcdir)/comet0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/comet4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/comet5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/cometd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/credits0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/credits1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/credits2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/credits3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/creditsd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/goldstard.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/goldstar0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/goldstar1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/help0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/help1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/help2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/help3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/helpd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/lesson0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/lesson1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/lesson2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/lesson3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/lessond.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/main0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/main1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/main2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/main3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/main4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/main5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/main6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/main7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/maind.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/quit0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/no_goldstard.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/no_goldstar0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/quit1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/quit2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/quit3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/quit4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/quit5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/quit6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/quit7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/quit8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/quitd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/trophy0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/trophy1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/trophyd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_config0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_config1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_config_brown0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_config_brown1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_config_brownd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_configd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_blue0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_blue1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_blue2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_blue3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_blue4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_blue5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_blued.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_green0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_green1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_green2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_green3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_green4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_green5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_greend.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_red0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_red1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_red2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_red3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_red4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_red5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_redd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
- $(INSTALL_DATA) $(srcdir)/tux_helmet_yellowd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-
-uninstall-local:
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/cometd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/creditsd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstard.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstar0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/helpd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lessond.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main6.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main7.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/maind.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/no_goldstard.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit6.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit7.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit8.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quitd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophyd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brownd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_configd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blued.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_greend.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_redd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellowd.png
- rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: tuxmath/trunk/intl/localename.c
===================================================================
--- tuxmath/trunk/intl/localename.c 2007-11-26 06:57:34 UTC (rev 344)
+++ tuxmath/trunk/intl/localename.c 2007-11-26 13:11:13 UTC (rev 345)
@@ -1142,7 +1142,7 @@
switch (sub)
{
case SUBLANG_BENGALI_INDIA: return "bn_IN";
- case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
+// case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
}
return "bn";
case LANG_BULGARIAN: return "bg_BG";
@@ -1356,7 +1356,7 @@
switch (sub)
{
case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
- case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
+// case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
}
return "pa";
case LANG_RHAETO_ROMANCE: return "rm_CH";
@@ -1364,7 +1364,7 @@
switch (sub)
{
case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
- case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
+// case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
}
return "ro";
case LANG_RUSSIAN:
Modified: tuxmath/trunk/nsis/tuxmath.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath.nsi 2007-11-26 06:57:34 UTC (rev 344)
+++ tuxmath/trunk/nsis/tuxmath.nsi 2007-11-26 13:11:13 UTC (rev 345)
@@ -2,7 +2,7 @@
# with a few tiny modifications by Phil Harper(philh at theopencd.org)
# modified for tuxmath by Yves Combe (yves at ycombe.net)
-!define PKG_VERSION "1.5.7"
+!define PKG_VERSION "1.5.8"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
@@ -31,7 +31,7 @@
# Licence text
LicenseText "You must agree to this license before installing ${APP_NAME}"
-LicenseData "docs\COPYING.txt"
+LicenseData "doc\COPYING.txt"
# Directory browsing
# DirShow show
@@ -49,8 +49,8 @@
File "mingw32\*.dll"
SetOutPath $INSTDIR\data
File /r "mingw32\data\*.*"
- SetOutPath $INSTDIR\docs
- File "docs\COPYING.txt"
+ SetOutPath $INSTDIR\doc
+ File "doc\COPYING.txt"
WriteRegStr HKLM SOFTWARE\${APP_PREFIX} \
"Install_Dir" \
@@ -117,7 +117,7 @@
DeleteRegKey HKLM SOFTWARE\${APP_PREFIX}
RMDir /r "$INSTDIR\data"
- RMDir /r "$INSTDIR\docs"
+ RMDir /r "$INSTDIR\doc"
Delete "$INSTDIR\*.*"
Delete "$DESKTOP\${APP_NAME}.lnk"
Modified: tuxmath/trunk/nsis/tuxmath.nsi.in
===================================================================
--- tuxmath/trunk/nsis/tuxmath.nsi.in 2007-11-26 06:57:34 UTC (rev 344)
+++ tuxmath/trunk/nsis/tuxmath.nsi.in 2007-11-26 13:11:13 UTC (rev 345)
@@ -31,7 +31,7 @@
# Licence text
LicenseText "You must agree to this license before installing ${APP_NAME}"
-LicenseData "docs\COPYING.txt"
+LicenseData "doc\COPYING.txt"
# Directory browsing
# DirShow show
@@ -49,8 +49,8 @@
File "mingw32\*.dll"
SetOutPath $INSTDIR\data
File /r "mingw32\data\*.*"
- SetOutPath $INSTDIR\docs
- File "docs\COPYING.txt"
+ SetOutPath $INSTDIR\doc
+ File "doc\COPYING.txt"
WriteRegStr HKLM SOFTWARE\${APP_PREFIX} \
"Install_Dir" \
@@ -117,7 +117,7 @@
DeleteRegKey HKLM SOFTWARE\${APP_PREFIX}
RMDir /r "$INSTDIR\data"
- RMDir /r "$INSTDIR\docs"
+ RMDir /r "$INSTDIR\doc"
Delete "$INSTDIR\*.*"
Delete "$DESKTOP\${APP_NAME}.lnk"
Modified: tuxmath/trunk/nsis/tuxmath_with_conf.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2007-11-26 06:57:34 UTC (rev 344)
+++ tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2007-11-26 13:11:13 UTC (rev 345)
@@ -2,7 +2,7 @@
# with a few tiny modifications by Phil Harper(philh at theopencd.org)
# modified for tuxmath by Yves Combe (yves at ycombe.net)
-!define PKG_VERSION "1.5.7"
+!define PKG_VERSION "1.5.8"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
More information about the Tux4kids-commits
mailing list