[Tux4kids-commits] r1119 - in tuxtype/branches/gsoc-sarah: . doc src

David Bruce dbruce-guest at alioth.debian.org
Tue Jun 30 17:30:02 UTC 2009


Author: dbruce-guest
Date: 2009-06-30 17:30:00 +0000 (Tue, 30 Jun 2009)
New Revision: 1119

Modified:
   tuxtype/branches/gsoc-sarah/Makefile.am
   tuxtype/branches/gsoc-sarah/Makefile.am~
   tuxtype/branches/gsoc-sarah/aclocal.m4
   tuxtype/branches/gsoc-sarah/doc/ChangeLog
   tuxtype/branches/gsoc-sarah/src/Makefile.in
Log:
Changed file permissions for pkglocalstatedir (i.e. /usr/local/var/tuxtype with
default build) and pkgsysconfdir to make sure they are user-writable.



Modified: tuxtype/branches/gsoc-sarah/Makefile.am
===================================================================
--- tuxtype/branches/gsoc-sarah/Makefile.am	2009-06-30 11:11:20 UTC (rev 1118)
+++ tuxtype/branches/gsoc-sarah/Makefile.am	2009-06-30 17:30:00 UTC (rev 1119)
@@ -39,9 +39,11 @@
 
 # Sould we skip uninstall of these directories to avoid clobbering user-created files
 # on upgrade?:
+# NOTE - at least for Debian and RPM packaging, "make uninstall" is completely
+# irrelevant to the upgrade process.
 install-data-hook:
-	$(MKDIR_P) -m 755 $(DESTDIR)$(pkglocalstatedir)
-	$(MKDIR_P) -m 755 $(DESTDIR)$(pkgsysconfdir)
+	$(MKDIR_P) -m 777 $(DESTDIR)$(pkglocalstatedir)
+	$(MKDIR_P) -m 777 $(DESTDIR)$(pkgsysconfdir)
 
 uninstall-hook:
 	rm -rf $(DESTDIR)$(pkglocalstatedir)

Modified: tuxtype/branches/gsoc-sarah/Makefile.am~
===================================================================
--- tuxtype/branches/gsoc-sarah/Makefile.am~	2009-06-30 11:11:20 UTC (rev 1118)
+++ tuxtype/branches/gsoc-sarah/Makefile.am~	2009-06-30 17:30:00 UTC (rev 1119)
@@ -1,71 +1,177 @@
-# Modified to include support for NSIS Windows installer - David Bruce <dbruce at tampabay.rr.com>
+# Modified to include support for NSIS Windows installer - David Bruce <davidstuartbruce at gmail.com>
+# Support for gettext:
+datadir = @datadir@
+localedir = $(datadir)/locale
+pkglocalstatedir = $(localstatedir)/$(PACKAGE)
+pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
+
+SUBDIRS = data \
+	doc	\
+	intl	\
+	po	\
+	src
+
+EXTRA_DIST = tuxtype.spec \
+	tuxtype.desktop  \
+	tuxtype.ico \
+	icon.png \
+	Info.plist \
+	config.rpath 
+
+
+
+## These are defined in configure.ac:
 MAKENSIS=@NSIS@
+NSIS_FOUND=@NSIS_FOUND@
+NSI_INSTALL_DIR=@NSI_INSTALL_DIR@
+NSI_DLL_DIR=@NSI_DLL_DIR@
+NSI_TEMP_INSTALL_DIR=$(abs_top_builddir)/_instw32
 
-SUBDIRS = data doc src
 
-EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in config.h autorun.inf tuxtype.ico
-
+##FIXME redo with proper Automake variables: 
 install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/doc/$(PACKAGE)
-	$(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(prefix)/doc/$(PACKAGE)/ChangeLog
-	$(INSTALL_DATA) $(srcdir)/tuxtype.lsm $(DESTDIR)$(prefix)/doc/$(PACKAGE)/tuxtype.lsm
 	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)
 	$(INSTALL_DATA) $(srcdir)/tuxtype.ico $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype.ico
-	$(INSTALL_DATA) $(srcdir)/autorun.inf $(DESTDIR)$(prefix)/share/$(PACKAGE)/autorun.inf
 
 uninstall-local:
-	-rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/ChangeLog
-	-rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/tuxtype.lsm
-	-rm -rf $(DESTDIR)$(prefix)/doc/$(PACKAGE)
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/autorun.inf
 	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype.ico
 	-rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)
 
-# Now doing this in preferred way via AM_INIT_AUTOMAKE in configure.ac:
-#AUTOMAKE_OPTIONS = foreign 
+# Sould we skip uninstall of these directories to avoid clobbering user-created files
+# on upgrade?:
+install-data-hook:
+	$(MKDIR_P) -m 777 $(DESTDIR)$(pkglocalstatedir)
+	$(MKDIR_P) -m 777 $(DESTDIR)$(pkgsysconfdir)
 
+uninstall-hook:
+	rm -rf $(DESTDIR)$(pkglocalstatedir)
+	rm -rf $(DESTDIR)$(pkgsysconfdir)
 
+
+
 # Rule to build tar-gzipped distribution package
 $(PACKAGE)-$(VERSION).tar.gz: distcheck
 
+#FIXME this won't really work.  Build for rpm packages now automated at
+#http://build.opensuse.org in "Education" project - DSB
 # Rule to build RPM distribution package
 rpm: $(PACKAGE)-$(VERSION).tar.gz
 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
 
-# Rules needed to cross-build nsis Win32 installer under Linux
-# Taken from tuxmath's Makefile.am - David Bruce
-# This rule probably kludgy (hardcoded)- DSB
-install-nsi-local: all
-	$(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/data;
-	$(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/docs;
-
-	(cd $(top_srcdir)/tuxtype/data ; 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)/data ; tar xf -) ; \
-	(cd $(top_srcdir)/tuxtype/docs ; 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)/docs ; tar xf -) ; \
-	cp $(top_srcdir)/COPYING $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/COPYING.txt ; \
-	cp $(top_srcdir)/AUTHORS $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/AUTHORS.txt ; \
-	cp $(top_srcdir)/INSTALL $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/INSTALL.txt ; \
-	cp $(top_srcdir)/README $(top_srcdir)/$(NSI_INSTALL_DIR)/docs/README.txt ; \
-	cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR) ; \
-	cp $(SUBDIRS)/tuxtype.exe $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxType.exe ;
-
-#	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.
+## i.e. to make tarball to post for individual download. 
+## 
+## for tarball with fonts: use 'make dist_with_fonts'
+## for tarball without fonts: (e.g. for Debian packaging) - use 'make distcheck'
+##
 ## (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.
+## 'data_fonts' should contain all of the fonts in data/fonts. It needs to go
+## in this Makefile.am before the 'dist_with_fonts' target for that target
+## to work - if it is in data/fonts/Makefile.am, it does not get expanded
+## before the 'dist' target starts:
+data_fonts='AndikaDesRevG.ttf DoulosSILR.ttf Kedage-n.ttf lohit_bn.ttf lohit_gu.ttf lohit_hi.ttf lohit_ta.ttf lohit_pa.ttf Rachana_w01.ttf utkal.ttf Vemana.ttf'
+## *.tar.gz version:
 dist_with_fonts:
-	$(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) dist_fonts='AndikaDesRevG.ttf DoulosSILR.ttf Rachana_w01.ttf' dist
+	$(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) \
+  dist_fonts=$(data_fonts) dist
 
+## *.tar.bz2 version:
+dist_with_fonts_bzip2:
+	$(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) \
+  dist_fonts=$(data_fonts) dist-bzip2
+
+
+## For building the NSIS executable Win32 installer - this rule first
+## does a "make install" into NSI_TEMP_INSTALL_DIR, which results in
+## a local copy of the complete unix-style install.
+## Subsequent commands then copy the needed files into NSI_INSTALL_DIR,
+## which has the exact directory structure of the self-contained
+## 'TuxType' folder that gets installed onto the Windows machine.
+
+install-nsi-local: all
+## create NSI_TEMP_INSTALL_DIR and install to that location:
+	$(INSTALL) -d $(NSI_TEMP_INSTALL_DIR)
+	$(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(NSI_TEMP_INSTALL_DIR) install
+## create NSI_INSTALL_DIR/data dir and copy data files to that location:
+	$(INSTALL) -d $(top_builddir)/$(NSI_INSTALL_DIR)/data;
+	(cd $(NSI_TEMP_INSTALL_DIR)/$(pkgdatadir); \
+           tar cf -  * ) \
+           | ( cd $(top_builddir)/$(NSI_INSTALL_DIR)/data; \
+           tar xf -)
+## create NSI_INSTALL_DIR/doc dir and copy docs to that location:
+	$(INSTALL) -d $(top_builddir)/$(NSI_INSTALL_DIR)/doc;
+	(cd $(NSI_TEMP_INSTALL_DIR)/$(docdir); \
+           tar cf -  * ) \
+           | ( cd $(top_builddir)/$(NSI_INSTALL_DIR)/doc; \
+           tar xf -)
+## create NSI_INSTALL_DIR/locale dir and copy locales to that location:
+	$(INSTALL) -d $(top_builddir)/$(NSI_INSTALL_DIR)/locale;
+	(cd $(NSI_TEMP_INSTALL_DIR)/$(localedir); \
+           tar cf -  * ) \
+           | ( cd $(top_builddir)/$(NSI_INSTALL_DIR)/locale; \
+           tar xf -)
+## copy executable into NSI_INSTALL_DIR:
+	(cd $(NSI_TEMP_INSTALL_DIR)/$(bindir); \
+           mv *TuxType.exe TuxType.exe; \
+           tar cf - TuxType.exe  ) \
+           | ( cd $(top_builddir)/$(NSI_INSTALL_DIR); \
+           tar xf -)
+## Done with NSI_TEMP_INSTALL_DIR so uninstall:
+	$(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(NSI_TEMP_INSTALL_DIR) uninstall
+	rm -rf $(NSI_TEMP_INSTALL_DIR)
+## copy needed dll files into NSI_INSTALL_DIR:
+	-cp $(NSI_DLL_DIR)/*.dll $(top_builddir)/$(NSI_INSTALL_DIR);
+
+
 install-nsi-am: install-nsi-local
 
-nsis: install-nsi-local
-	$(MAKENSIS) -NOCD nsis/tuxtype.nsi
 
+nsis:
+	if test "x$(MAKENSIS)" = "x"; then \
+	  echo "\nError - makensis program not found!"; \
+          echo "It is needed to build the NSIS executable installer for Windows."; \
+          echo "Install it from your distribution's repository, or" ; \
+          echo "download it from: http://nsis.sourceforge.net/Download\n"; \
+	else \
+	$(MAKE) $(AM_MAKEFLAGS) install-nsi-local; \
+	  $(MAKENSIS) -NOCD nsis/tuxtype.nsi; \
+	fi
 
+
 clean-local:
 	@$(NORMAL_CLEAN)
 	if test -d $(NSI_INSTALL_DIR); then \
 	  rm -fr $(NSI_INSTALL_DIR); \
-	fi
\ No newline at end of file
+	fi
+
+
+check-gettext:
+	@if test x$(USE_NLS) != "xyes" ; then echo "Missing gettext. Rerun configure and check for" \
+	"'checking whether to use NLS... yes'!" ; exit 1 ; fi
+
+update-po: check-gettext
+	@find $(srcdir)/src/ -name "*.c" -print | sort > $(srcdir)/po/POTFILES.in.2 ; \
+	if diff $(srcdir)/po/POTFILES.in $(srcdir)/po/POTFILES.in.2 >/dev/null 2>&1 ; then \
+		rm -f $(srcdir)/po/POTFILES.in.2 ; \
+	else \
+		mv $(srcdir)/po/POTFILES.in.2 $(srcdir)/po/POTFILES.in ; \
+	fi
+	cd po && $(MAKE) $(AM_MAKEFLAGS) update-po
+
+update-gmo: check-gettext
+	cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo
+
+force-update-gmo: check-gettext
+	touch po/*.po
+	cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo
+
+force-update-gmo-%: check-gettext
+	@language=`echo $@ | sed s/force-update-gmo-//` ; \
+	if test ! -f po/$$language.po ; then echo "file po/$$language.po does not exist" ; exit 1 ; fi ; \
+	touch po/$$language.po ; \
+	cd po && $(MAKE) $(AM_MAKEFLAGS) update-gmo
+
+.PHONY: check-gettext update-po update-gmo force-update-gmo nsis

Modified: tuxtype/branches/gsoc-sarah/aclocal.m4
===================================================================
--- tuxtype/branches/gsoc-sarah/aclocal.m4	2009-06-30 11:11:20 UTC (rev 1118)
+++ tuxtype/branches/gsoc-sarah/aclocal.m4	2009-06-30 17:30:00 UTC (rev 1119)
@@ -3985,59 +3985,61 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 4
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file.  Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*)   set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 

Modified: tuxtype/branches/gsoc-sarah/doc/ChangeLog
===================================================================
--- tuxtype/branches/gsoc-sarah/doc/ChangeLog	2009-06-30 11:11:20 UTC (rev 1118)
+++ tuxtype/branches/gsoc-sarah/doc/ChangeLog	2009-06-30 17:30:00 UTC (rev 1119)
@@ -1,4 +1,9 @@
-29 June 2009(svn.debian.org/tux4kids - previous revisions to 1116)
+30 Jun 2009 (svn.debian.org/tux4kids - revision 1119)
+[ David Bruce <davidstuartbruce at gmail.com> ]
+        - Build - changed file permissions on installed localstatedir and sysconfdir
+	          from 755 to 777 so they will be user-writable.
+
+June 2009(svn.debian.org/tux4kids - previous revisions to 1116)
 [ Sarah Frisk <ssfrisk at gmail.com>]
 		- Custom Word Lists Configuration Program (titlescreen.c):
 		- Cleaned up the previous wordlist configure functions to make code more readable/fix

Modified: tuxtype/branches/gsoc-sarah/src/Makefile.in
===================================================================
--- tuxtype/branches/gsoc-sarah/src/Makefile.in	2009-06-30 11:11:20 UTC (rev 1118)
+++ tuxtype/branches/gsoc-sarah/src/Makefile.in	2009-06-30 17:30:00 UTC (rev 1119)
@@ -207,6 +207,8 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+
+# Support for gettext:
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -223,7 +225,7 @@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-localedir = @localedir@
+localedir = $(datadir)/locale
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -244,10 +246,22 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+pkglocalstatedir = $(localstatedir)/$(PACKAGE)
+pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
+ at BUILD_MINGW32_FALSE@DATA_PREFIX = ${pkgdatadir}
+ at BUILD_MINGW32_TRUE@DATA_PREFIX = @MINGW32_PACKAGE_DATA_DIR@
+ at BUILD_MINGW32_FALSE@VAR_PREFIX = ${pkglocalstatedir}
+ at BUILD_MINGW32_TRUE@VAR_PREFIX = @MINGW32_PACKAGE_VAR_DIR@
+ at BUILD_MINGW32_FALSE@CONF_PREFIX = ${pkgsysconfdir}
+ at BUILD_MINGW32_TRUE@CONF_PREFIX = @MINGW32_PACKAGE_CONF_DIR@
 ACLOCAL_AMFLAGS = -I m4
 # Is the following line obsolete?
 #DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-AM_CFLAGS = -Wall -g -DDATA_PREFIX=\"${DATA_PREFIX}\" -DDEBUG \
+AM_CFLAGS = -Wall -g \
+        -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
+        -DVAR_PREFIX=\"$(VAR_PREFIX)\" \
+        -DCONF_PREFIX=\"$(CONF_PREFIX)\" \
+        -DDEBUG \
 	-DVERSION=\"@NAME_VERSION@\" -D$(SOUND)SOUND
 
 AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" \
@@ -256,12 +270,6 @@
 	-I../intl -I$(top_srcdir)/intl
 
 @BUILD_MINGW32_FALSE at TUXTYPERC = 
- at BUILD_MINGW32_FALSE@DATA_PREFIX = ${pkgdatadir}
- at BUILD_MINGW32_TRUE@DATA_PREFIX = @MINGW32_PACKAGE_DATA_DIR@
- at BUILD_MINGW32_FALSE@VAR_PREFIX = $(pkglocalstatedir)
- at BUILD_MINGW32_TRUE@VAR_PREFIX = @MINGW32_PACKAGE_VAR_DIR@
- at BUILD_MINGW32_FALSE@CONF_PREFIX = $(pkgsysconfdir)
- at BUILD_MINGW32_TRUE@CONF_PREFIX = @MINGW32_PACKAGE_CONF_DIR@
 LDADD = @LIBINTL@
 tuxtype_LDFLAGS = $(LTLIBINTL)
 tuxtype_SOURCES = \




More information about the Tux4kids-commits mailing list