[Tux4kids-commits] r211 - in tuxmath/trunk: . data/images/sprites docs nsis
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Wed Aug 22 01:22:12 UTC 2007
Author: dbruce-guest
Date: 2007-08-22 01:22:12 +0000 (Wed, 22 Aug 2007)
New Revision: 211
Modified:
tuxmath/trunk/Makefile.am
tuxmath/trunk/data/images/sprites/Makefile
tuxmath/trunk/docs/changelog
tuxmath/trunk/nsis/tuxmath.nsi
tuxmath/trunk/nsis/tuxmath_with_conf.nsi
Log:
Bug fixes in Makefile.am - "make distcheck" runs without errors!
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2007-08-21 18:11:45 UTC (rev 210)
+++ tuxmath/trunk/Makefile.am 2007-08-22 01:22:12 UTC (rev 211)
@@ -10,6 +10,7 @@
##datadir = @datadir@
##localedir = $(datadir)/locale
+# This rule is a brute-force kludge!
install-data-local:
@$(NORMAL_INSTALL)
if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \
@@ -26,8 +27,8 @@
$(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 $(SUBDIRS)/*.exe $(top_srcdir)/$(NSI_INSTALL_DIR) ;
+ cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR) ;
+ cp $(top_srcdir)/src/TuxMath.exe $(top_srcdir)/$(NSI_INSTALL_DIR) ;
if NSI_USE_TUXMATH_CONF
$(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
@@ -36,6 +37,14 @@
install-nsi-am: install-nsi-local
+# How's this for brute force?!
+uninstall-local:
+ -chmod -R a+w $(DESTDIR)$(prefix)/share/$(PACKAGE);
+ -rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE);
+ -for i in *.po; do langcode=$$(echo $$i | sed 's/\.po//'); \
+ rm $(DESTDIR)/$(localedir)/$$langcode/LC_MESSAGES/tuxmath.mo $$langcode.po; \
+ done;
+
nsis: install-nsi-local
if NSI_USE_TUXMATH_CONF
$(MAKENSIS) -NOCD nsis/tuxmath_with_conf.nsi
Modified: tuxmath/trunk/data/images/sprites/Makefile
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile 2007-08-21 18:11:45 UTC (rev 210)
+++ tuxmath/trunk/data/images/sprites/Makefile 2007-08-22 01:22:12 UTC (rev 211)
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10 from Makefile.am.
-# tuxtype/data/images/menu/Makefile. Generated from Makefile.in by configure.
+# data/images/sprites/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -14,9 +14,9 @@
-pkgdatadir = $(datadir)/tuxtype
-pkglibdir = $(libdir)/tuxtype
-pkgincludedir = $(includedir)/tuxtype
+pkgdatadir = $(datadir)/tuxmath
+pkglibdir = $(libdir)/tuxmath
+pkgincludedir = $(includedir)/tuxmath
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -29,10 +29,10 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
-subdir = tuxtype/data/images/menu
+build_triplet = i386-pc-linux-gnu
+host_triplet = i586-pc-mingw32msvc
+target_triplet = i586-pc-mingw32msvc
+subdir = data/images/sprites
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -45,20 +45,17 @@
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dbruce/tuxtype2/tuxtype/trunk/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dbruce/tuxtype2/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/dbruce/tuxtype2/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dbruce/tuxtype2/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dbruce/tuxtype2/tuxtype/trunk/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run automake-1.10
AWK = mawk
-CC = gcc
+CC = i586-mingw32msvc-gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-CPP = gcc -E
-CPPFLAGS = -DDATA_PREFIX=\"$(prefix)\"
-CXX = g++
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
+CPP = i586-mingw32msvc-gcc -E
+CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
@@ -66,71 +63,74 @@
ECHO_N = -n
ECHO_T =
EGREP = /bin/grep -E
-EXEEXT =
+EXEEXT = .exe
GREP = /bin/grep
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS =
-LIBOBJS =
-LIBS = -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image
-LN_S = ln -s
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/dbruce/tuxtype2/tuxtype/trunk/missing --run makeinfo
+LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
+LIBOBJS = ${LIBOBJDIR}strtod$U.o
+LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lgw32c -luuid -lole32 -lwsock32 -mwindows
+LTLIBOBJS = ${LIBOBJDIR}strtod$U.lo
+MAINT = #
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
+NAME_VERSION = tuxmath-1.5.2
NSIS = /usr/bin/makensis
-NSI_DLL_DIR = /home/dbruce/tuxtype_dll
+NSI_DLL_DIR = /home/dbruce/tuxmath_dll
NSI_INSTALL_DIR = mingw32
+NSI_TUXMATH_CONF_DIR = no
OBJEXT = o
-PACKAGE = tuxtype
+PACKAGE = tuxmath
PACKAGE_BUGREPORT =
-PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.6
-PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.6
+PACKAGE_DATA_DIR = data
+PACKAGE_NAME =
+PACKAGE_STRING =
+PACKAGE_TARNAME =
+PACKAGE_VERSION =
PATH_SEPARATOR = :
+POW_LIB =
SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
SDL_CONFIG = /usr/bin/sdl-config
SDL_LIBS = -L/usr/lib -lSDL
SET_MAKE =
SHELL = /bin/sh
-STRIP =
-VERSION = 1.5.6
-WINDRES =
-abs_builddir = /home/dbruce/tuxtype2/tuxtype/trunk/tuxtype/data/images/menu
-abs_srcdir = /home/dbruce/tuxtype2/tuxtype/trunk/tuxtype/data/images/menu
-abs_top_builddir = /home/dbruce/tuxtype2/tuxtype/trunk
-abs_top_srcdir = /home/dbruce/tuxtype2/tuxtype/trunk
-ac_ct_CC = gcc
-ac_ct_CXX = g++
+STRIP = i586-mingw32msvc-strip
+VERSION = 1.5.2
+WINDRES = /usr/bin/i586-mingw32msvc-windres
+abs_builddir = /home/dbruce/tux4kids/tuxmath/trunk/data/images/sprites
+abs_srcdir = /home/dbruce/tux4kids/tuxmath/trunk/data/images/sprites
+abs_top_builddir = /home/dbruce/tux4kids/tuxmath/trunk
+abs_top_srcdir = /home/dbruce/tux4kids/tuxmath/trunk
+ac_ct_CC =
am__include = include
am__leading_dot = .
am__quote =
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias =
-build_cpu = i686
+build = i386-pc-linux-gnu
+build_alias = i386-linux
+build_cpu = i386
build_os = linux-gnu
build_vendor = pc
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+docdir = ${datarootdir}/doc/${PACKAGE}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias =
-host_cpu = i686
-host_os = linux-gnu
+host = i586-pc-mingw32msvc
+host_alias = i586-mingw32msvc
+host_cpu = i586
+host_os = mingw32msvc
host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dbruce/tuxtype2/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxmath/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -139,90 +139,127 @@
mkdir_p = /bin/mkdir -p
oldincludedir = /usr/include
pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
+prefix = /usr/local/cross-tools/i586-mingw32msvc
+program_transform_name = s&^&i586-mingw32msvc-&
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
srcdir = .
sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias =
-target_cpu = i686
-target_os = linux-gnu
+target = i586-pc-mingw32msvc
+target_alias = i586-mingw32msvc
+target_cpu = i586
+target_os = mingw32msvc
target_vendor = pc
-top_builddir = ../../../..
-top_srcdir = ../../../..
-EXTRA_DIST = \
-cascade0.png\
-cascade1.png\
-cascade10.png\
-cascade2.png\
-cascade3.png\
-cascade4.png\
-cascade5.png\
-cascade6.png\
-cascade7.png\
-cascade8.png\
-cascade9.png\
-cascaded.png\
-comet0.png\
-comet1.png\
-comet2.png\
-comet3.png\
-comet4.png\
-comet5.png\
-cometd.png\
-keyboard0.png\
-keyboard1.png\
-keyboard2.png\
-keyboardd.png\
-keycas0.png\
-keycas1.png\
-keycas2.png\
-keycas3.png\
-keycas4.png\
-keycas5.png\
-keycas6.png\
-keycas7.png\
-keycas8.png\
-keycas9.png\
-keycasd.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\
-quit1.png\
-quit2.png\
-quit3.png\
-quit4.png\
-quit5.png\
-quit6.png\
-quit7.png\
-quit8.png\
-quitd.png\
-reg0.png\
-reg1.png\
-reg2.png\
-sel0.png\
-sel1.png\
-sel2.png
+top_builddir = ../../..
+top_srcdir = ../../..
+EXTRA_DIST = cascade0.png \
+ cascade10.png \
+ cascade1.png \
+ cascade2.png \
+ cascade3.png \
+ cascade4.png \
+ cascade5.png \
+ cascade6.png \
+ cascade7.png \
+ cascade8.png \
+ cascade9.png \
+ cascaded.png \
+ comet0.png \
+ comet1.png \
+ comet2.png \
+ comet3.png \
+ comet4.png \
+ comet5.png \
+ cometd.png \
+ keyboard0.png \
+ keyboard1.png \
+ keyboard2.png \
+ keyboardd.png \
+ keycas0.png \
+ keycas1.png \
+ keycas2.png \
+ keycas3.png \
+ keycas4.png \
+ keycas5.png \
+ keycas6.png \
+ keycas7.png \
+ keycas8.png \
+ keycas9.png \
+ keycasd.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 \
+ quit1.png \
+ quit2.png \
+ quit3.png \
+ quit4.png \
+ quit5.png \
+ quit6.png \
+ quit7.png \
+ quit8.png \
+ quitd.png \
+ reg0.png \
+ reg1.png \
+ reg2.png \
+ sel0.png \
+ sel1.png \
+ sel2.png \
+ tux_config0.png \
+ tux_config1.png \
+ tux_config_brown0.png \
+ tux_config_brown1.png \
+ tux_config_brownd.png \
+ tux_configd.png \
+ tux_helmet0.png \
+ tux_helmet1.png \
+ tux_helmet2.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_helmetd.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
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -231,9 +268,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/images/menu/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/images/sprites/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/images/menu/Makefile
+ $(AUTOMAKE) --gnu data/images/sprites/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -247,9 +284,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/configure: # $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
tags: TAGS
TAGS:
@@ -330,7 +367,7 @@
info-am:
-install-data-am: install-data-local
+install-data-am:
install-dvi: install-dvi-am
@@ -364,217 +401,20 @@
ps-am:
-uninstall-am: uninstall-local
+uninstall-am:
.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 \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-local
+ install install-am install-data install-data-am 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
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascade0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade0.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascade1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade1.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascade10.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade10.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascade2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade2.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascade3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade3.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascade4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade4.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascade5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade5.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascade6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade6.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascade7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade7.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascade8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade8.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascade9.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade9.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cascaded.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascaded.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/comet0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet0.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet1.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet2.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet3.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/comet4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet4.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/comet5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet5.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/cometd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cometd.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keyboard0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard0.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keyboard1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard1.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keyboard2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard2.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keyboardd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboardd.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keycas0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas0.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keycas1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas1.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keycas2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas2.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keycas3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas3.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keycas4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas4.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keycas5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas5.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keycas6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas6.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keycas7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas7.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keycas8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas8.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keycas9.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas9.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/keycasd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycasd.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/lesson0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson0.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/lesson1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson1.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/lesson2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson2.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/lesson3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson3.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/lessond.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lessond.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/main0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main0.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/main1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main1.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/main2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main2.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/main3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main3.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/main4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main4.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/main5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main5.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/main6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main6.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/main7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main7.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/maind.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/maind.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/quit0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit0.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/quit1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit1.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/quit2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit2.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/quit3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit3.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/quit4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit4.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/quit5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit5.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/quit6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit6.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/quit7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit7.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/quit8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit8.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/quitd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quitd.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/reg0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg0.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/reg1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg1.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/reg2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg2.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/sel0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel0.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/sel1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel1.png
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
- $(INSTALL_DATA) $(srcdir)/sel2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel2.png
-
-uninstall-local:
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade10.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade6.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade7.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade8.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade9.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascaded.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cometd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboardd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas6.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas7.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas8.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas9.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycasd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lessond.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main6.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main7.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/maind.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit3.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit4.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit5.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit6.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit7.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit8.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quitd.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg2.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel0.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel1.png
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel2.png
# 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/docs/changelog
===================================================================
--- tuxmath/trunk/docs/changelog 2007-08-21 18:11:45 UTC (rev 210)
+++ tuxmath/trunk/docs/changelog 2007-08-22 01:22:12 UTC (rev 211)
@@ -1,10 +1,13 @@
changelog for "tuxmath"
-2007.Aug.21 (svn.debian.org/tux4kids - revision 209)
+2007.Aug.21 (svn.debian.org/tux4kids - revision 211)
Version 1.5.2
Build:
* Doc updates
+ * Fixes in top-level Makefile.am - "make distcheck" now
+ succeeds without errors, "make uninstall" removes data and *.po
+ files proplerly.
David Bruce <dbruce at tampabay.rr.com>
Modified: tuxmath/trunk/nsis/tuxmath.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath.nsi 2007-08-21 18:11:45 UTC (rev 210)
+++ tuxmath/trunk/nsis/tuxmath.nsi 2007-08-22 01:22:12 UTC (rev 211)
@@ -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.1"
+!define PKG_VERSION "1.5.2"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
Modified: tuxmath/trunk/nsis/tuxmath_with_conf.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2007-08-21 18:11:45 UTC (rev 210)
+++ tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2007-08-22 01:22:12 UTC (rev 211)
@@ -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.1"
+!define PKG_VERSION "1.5.2"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
More information about the Tux4kids-commits
mailing list