? removed-strings.txt
? unified-menu-items.diff
? version-m4.diff
? ac-helpers/compile
? src/af/ev/unix/ev_UnixStockIcons.cpp
? src/af/ev/unix/ev_UnixStockIcons.h
? src/af/ev/unix/test
Index: GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/GNUmakefile.am,v
retrieving revision 1.43
diff -a -u -p -r1.43 GNUmakefile.am
--- GNUmakefile.am	13 Sep 2006 13:08:46 -0000	1.43
+++ GNUmakefile.am	18 Sep 2006 13:20:56 -0000
@@ -100,11 +100,11 @@ install-data-local:
 	@$(mkinstalldirs) $(DESTDIR)$(bonobodir)
 	if test -d $(top_srcdir)/../abidistfiles ; then \
 	  for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
-	    $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
+	    $(mkinstalldirs) $(DESTDIR)$(abisuite_datadir)/$$dir ;\
 	    if test "$$dir" = "./dictionary"; then \
 	      if test "$(INSTALLDICTIONARY)" != "no" ; then \
-	        $(INSTALL_DATA) $(dictionary) $(DESTDIR)$(pkgdatadir)/$$dir/american.hash; \
-	        $(INSTALL_DATA) $(dictionary_list) $(DESTDIR)$(pkgdatadir)/$$dir/ispell_dictionary_list.xml; \
+	        $(INSTALL_DATA) $(dictionary) $(DESTDIR)$(abisuite_datadir)/$$dir/american.hash; \
+	        $(INSTALL_DATA) $(dictionary_list) $(DESTDIR)$(abisuite_datadir)/$$dir/ispell_dictionary_list.xml; \
 	      fi; \
 	    else \
 	      for file in `echo $(top_srcdir)/../abidistfiles/$$dir/* | grep -v MANIFEST`; do \
@@ -113,7 +113,7 @@ install-data-local:
 		  if test "$$sfile.server" = $$file; then \
 		    $(INSTALL_DATA) $$file $(DESTDIR)$(bonobodir); \
 		  else \
-		    $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/$$dir; \
+		    $(INSTALL_DATA) $$file $(DESTDIR)$(abisuite_datadir)/$$dir; \
 		  fi; \
 	        fi; \
 	      done; \
@@ -124,14 +124,14 @@ install-data-local:
 	fi
 if WITH_GNOME
 else
-	rm -f $(DESTDIR)$(pkgdatadir)/icons/abiword_logo.xpm #XXX this is very dirty
+	rm -f $(DESTDIR)$(abisuite_datadir)/icons/abiword_logo.xpm #XXX this is very dirty
 endif
-	@$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/AbiWord
+	@$(mkinstalldirs) $(DESTDIR)$(abiword_datadir)
 	@for dir in `cd $(top_srcdir)/user/wp; find . -type d ! -name CVS` ; do \
-	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/AbiWord/$$dir ;\
+	  $(mkinstalldirs) $(DESTDIR)$(abiword_datadir)/$$dir ;\
 	  for file in $(top_srcdir)/user/wp/$$dir/* ; do \
 	    if test -f $$file ; then \
-	      $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/AbiWord/$$dir; \
+	      $(INSTALL_DATA) $$file $(DESTDIR)$(abiword_datadir)/$$dir; \
 	    fi ; \
 	  done; \
 	done
Index: configure.ac
===================================================================
RCS file: /cvsroot/abi/configure.ac,v
retrieving revision 1.190
diff -a -u -p -r1.190 configure.ac
--- configure.ac	16 Sep 2006 09:05:46 -0000	1.190
+++ configure.ac	18 Sep 2006 13:20:56 -0000
@@ -20,13 +20,13 @@ dnl 02111-1307, USA.
 
 dnl Process this file with autoconf to produce a configure script.
 
+m4_include([version.m4])
+
 AC_PREREQ(2.50)
-AC_INIT([AbiSuite],[2.6],[http://www.abisource.com/])
+AC_INIT([AbiSuite],[abisuite_version],[http://www.abisource.com/])
 AC_CONFIG_SRCDIR([src/af/ev/xp/ev_Menu.h])
 AC_CONFIG_AUX_DIR(ac-helpers)
-dnl AC_CONFIG_HEADERS(config.h)
-
-AM_INIT_AUTOMAKE(AbiSuite-2.6,2.5.0)
+AM_INIT_AUTOMAKE
 
 if test "$srcdir" = "."; then
 	abi_rootdir=".."
@@ -507,6 +507,15 @@ AC_SUBST(VALGRIND)
 
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 
+# Config defaults
+AC_SUBST(abisuite_datadir, '${datadir}/abisuite/${VERSION}')
+AC_SUBST(abisuite_libdir, '${libdir}/abisuite/${VERSION}')
+
+AC_SUBST(abiword_datadir, '${abisuite_datadir}/abiword')
+AC_SUBST(abiword_gladedir, '${abiword_datadir}/glade')
+AC_SUBST(abiword_libdir, '${libdir}/abisuite/${VERSION}/abiword')
+###
+
 AC_CONFIG_FILES([goffice-bits/GNUmakefile])
 
 AC_CONFIG_FILES([GNUmakefile
Index: includes.mk
===================================================================
RCS file: /cvsroot/abi/includes.mk,v
retrieving revision 1.63
diff -a -u -p -r1.63 includes.mk
--- includes.mk	12 Sep 2006 22:07:25 -0000	1.63
+++ includes.mk	18 Sep 2006 13:20:56 -0000
@@ -136,7 +136,6 @@ PLATFORM_CFLAGS = @PLATFORM_CFLAGS@ $(CO
 
 CFLAGS   = @CFLAGS@   $(ABI_CFLAGS) $(PLATFORM_CFLAGS)
 CXXFLAGS = @CXXFLAGS@ $(ABI_CFLAGS) $(PLATFORM_CFLAGS) \
-	-DABISUITE_HOME=\"@ABISUITE_HOME@\" \
 	-DABI_BUILD_VERSION=\"@VERSION@\"
 
 ABI_FE = @ABI_FE@
Index: version.m4
===================================================================
RCS file: version.m4
diff -N version.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ version.m4	18 Sep 2006 13:20:56 -0000
@@ -0,0 +1,5 @@
+
+m4_define([abisuite_version_epoch], [2])
+m4_define([abisuite_version_major], [5])
+m4_define([abisuite_version_minor], [0])
+m4_define([abisuite_version], [abisuite_version_epoch.abisuite_version_major.abisuite_version_minor])
Index: ac-helpers/abi-detect-platform.m4
===================================================================
RCS file: /cvsroot/abi/ac-helpers/abi-detect-platform.m4,v
retrieving revision 1.25
diff -a -u -p -r1.25 abi-detect-platform.m4
--- ac-helpers/abi-detect-platform.m4	2 Jun 2006 23:41:23 -0000	1.25
+++ ac-helpers/abi-detect-platform.m4	18 Sep 2006 13:20:56 -0000
@@ -227,28 +227,21 @@ esac
 case "$OS_NAME" in 
 	WIN32)
 		PLATFORM="win"
-		ABISUITE_HOME="\$(pkgdatadir)"
 		;;
 	Linux|AIX|*BSD|IRIX*|HP|OSF1|SunOS|DragonFly)
 		PLATFORM="unix"
-		ABISUITE_HOME="\$(pkgdatadir)"
 		;;
 	QNX|procnto)
 		PLATFORM="qnx"
-		ABISUITE_HOME="\$(pkgdatadir)"
 		;;
 	MACOSX)
 		PLATFORM=$abi_gui
-		ABISUITE_HOME="\$(pkgdatadir)"
 		;;
 	*)
 	       PLATFORM="unix"
-		ABISUITE_HOME="\$(pkgdatadir)"
 		;;
 esac
 
-AC_SUBST(ABISUITE_HOME)
-
 if test "$PLATFORM" = "cocoa"; then
 	BE_PLATFORM="unix"
 else
Index: src/af/xap/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/af/xap/unix/GNUmakefile.am,v
retrieving revision 1.51
diff -a -u -p -r1.51 GNUmakefile.am
--- src/af/xap/unix/GNUmakefile.am	16 Sep 2006 00:22:09 -0000	1.51
+++ src/af/xap/unix/GNUmakefile.am	18 Sep 2006 13:20:56 -0000
@@ -40,7 +40,7 @@ INCLUDES = 				\
 
 noinst_LIBRARIES = libXap_unix.a
 
-gladedir=$(datadir)/$(PACKAGE)/AbiWord/glade
+gladedir=$(abiword_gladedir)
 
 if WITH_PRINTING
 print_src = xap_UnixPSFont.cpp				\
Index: src/af/xap/unix/xap_UnixDlg_PluginManager.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixDlg_PluginManager.cpp,v
retrieving revision 1.34
diff -a -u -p -r1.34 xap_UnixDlg_PluginManager.cpp
--- src/af/xap/unix/xap_UnixDlg_PluginManager.cpp	9 Jul 2006 00:21:34 -0000	1.34
+++ src/af/xap/unix/xap_UnixDlg_PluginManager.cpp	18 Sep 2006 13:20:56 -0000
@@ -1,3 +1,5 @@
+/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */
+
 /* AbiSource Application Framework
  * Copyright (C) 2003 Marc Maurer
  * Copyright (C) 2001-2003 AbiSource, Inc.
Index: src/wp/ap/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/GNUmakefile.am,v
retrieving revision 1.62
diff -a -u -p -r1.62 GNUmakefile.am
--- src/wp/ap/unix/GNUmakefile.am	16 Sep 2006 00:22:10 -0000	1.62
+++ src/wp/ap/unix/GNUmakefile.am	18 Sep 2006 13:20:57 -0000
@@ -27,18 +27,20 @@ SUBDIRS= hildon
 endif
 
 INCLUDES= \
-	-DABIWORD_PREFIX=\""$(prefix)"\"			\
-	-DABIWORD_SYSCONFDIR=\""$(sysconfdir)"\"			\
-	-DABIWORD_DATADIR=\""$(datadir)"\"			\
-	-DABIWORD_APP_NAME="\"$(ABIWORD_APP_NAME)\"" \
-	-DABIWORD_APP_LIBDIR="\"$(ABIWORD_APP_LIBDIR)\"" \
-	-DABIWORD_LIBDIR="\"$(libdir)\"" \
-	$(AF_INCLUDES) $(TEXT_INCLUDES) $(WP_INCLUDES) \
+	-DABIWORD_APP_NAME="\"$(ABIWORD_APP_NAME)\"" 	\
+	-DPREFIX=\""$(prefix)"\"			\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
+	-DDATADIR=\""$(datadir)"\"			\
+	-DLIBDIR=\""$(libdir)"\"			\
+	-DABIWORD_LIBDIR="\"$(abiword_libdir)\"" 	\
+	-DABIWORD_DATADIR="\"$(abiword_datadir)\"" 	\
+	-DABIWORD_GLADEDIR="\"$(abiword_gladedir)\"" 	\
+	$(AF_INCLUDES) $(TEXT_INCLUDES) $(WP_INCLUDES) 	\
 	@GMODULE_CFLAGS@ @GTK_CFLAGS@ $(OTHER_INCLUDES) $(ICONV_INCLUDES)
 
 noinst_LIBRARIES = libWpAp_unix.a
 
-gladedir=$(datadir)/$(PACKAGE)/AbiWord/glade
+gladedir=$(abiword_gladedir)
 
 glade_DATA = \
 	ap_UnixDialog_Break.glade \
Index: src/wp/ap/unix/ap_UnixApp.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixApp.cpp,v
retrieving revision 1.302
diff -a -u -p -r1.302 ap_UnixApp.cpp
--- src/wp/ap/unix/ap_UnixApp.cpp	16 Sep 2006 15:08:58 -0000	1.302
+++ src/wp/ap/unix/ap_UnixApp.cpp	18 Sep 2006 13:20:58 -0000
@@ -470,9 +470,9 @@ const char * AP_UnixApp::getAbiSuiteAppD
     // we return a static string, use it quickly.
 	
     static XML_Char buf[1024];
-    UT_ASSERT((strlen(getAbiSuiteLibDir()) + strlen(ABIWORD_APP_LIBDIR) + 2) < sizeof(buf));
+    UT_ASSERT((strlen(getAbiSuiteLibDir()) + strlen("abiword") + 2) < sizeof(buf));
 
-    sprintf(buf,"%s/%s",getAbiSuiteLibDir(),ABIWORD_APP_LIBDIR);
+    sprintf(buf,"%s/%s",getAbiSuiteLibDir(), "abiword");
     return buf;
 }
 
@@ -482,17 +482,9 @@ const char * AP_UnixApp::getAbiSuiteAppD
 */
 const char * AP_UnixApp::getAbiSuiteAppGladeDir(void) const
 {
-    // we return a static string, use it quickly.
-	
-    static XML_Char buf[1024];
-    // FIXME: remove the hardcoded "/glade" location and get it from the makefile
-    UT_ASSERT((strlen(getAbiSuiteLibDir()) + strlen(ABIWORD_APP_LIBDIR) + strlen("/glade") + 3) < sizeof(buf));
-
-    sprintf(buf,"%s/%s/glade",getAbiSuiteLibDir(),ABIWORD_APP_LIBDIR);
-    return buf;
+    return ABIWORD_GLADEDIR;
 }
 
-
 /*!
   This returns the current StringSet
   \return A const pointer to the StringSet
@@ -1399,10 +1391,10 @@ int AP_UnixApp::main(const char * szAppN
 #endif
 	  GnomeProgram * program = gnome_program_init ("AbiWord-" PACKAGE_VERSION, ABI_BUILD_VERSION, 
 												   LIBGNOMEUI_MODULE, XArgs.m_argc, const_cast<char **>(XArgs.m_argv),
-												   GNOME_PARAM_APP_PREFIX, ABIWORD_PREFIX,
-												   GNOME_PARAM_APP_SYSCONFDIR, ABIWORD_SYSCONFDIR,
-												   GNOME_PARAM_APP_DATADIR,	ABIWORD_DATADIR,
-												   GNOME_PARAM_APP_LIBDIR, ABIWORD_APP_LIBDIR,
+												   GNOME_PARAM_APP_PREFIX, PREFIX,
+												   GNOME_PARAM_APP_SYSCONFDIR, SYSCONFDIR,
+												   GNOME_PARAM_APP_DATADIR,	DATADIR,
+												   GNOME_PARAM_APP_LIBDIR, LIBDIR,
 												   GNOME_PARAM_POPT_TABLE, AP_Args::options, 
 												   GNOME_PARAM_NONE);
 #ifdef LOGFILE
Index: src/wp/ap/unix/hildon/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/unix/hildon/GNUmakefile.am,v
retrieving revision 1.1
diff -a -u -p -r1.1 GNUmakefile.am
--- src/wp/ap/unix/hildon/GNUmakefile.am	5 Jul 2005 14:08:22 -0000	1.1
+++ src/wp/ap/unix/hildon/GNUmakefile.am	18 Sep 2006 13:20:58 -0000
@@ -25,7 +25,7 @@ INCLUDES= -DABIWORD_APP_NAME="\"$(ABIWOR
 
 noinst_LIBRARIES = libWpAp_unixHildon.a
 
-gladedir=$(datadir)/$(PACKAGE)/AbiWord/glade
+gladedir=$(abiword_gladedir)
 
 glade_DATA = \
 	ap_UnixHildonDialog_HdrFtr.glade \
Index: src/wp/main/qnx/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/main/qnx/GNUmakefile.am,v
retrieving revision 1.8
diff -a -u -p -r1.8 GNUmakefile.am
--- src/wp/main/qnx/GNUmakefile.am	7 Dec 2005 19:01:53 -0000	1.8
+++ src/wp/main/qnx/GNUmakefile.am	18 Sep 2006 13:20:58 -0000
@@ -27,7 +27,7 @@ bin_SCRIPTS = AbiWord
 
 INCLUDES = \
 	-DABIWORD_APP_NAME="\"$(ABIWORD_APP_NAME)\"" \
-	-DABISUITE_HOME="\"$(pkgdatadir)\"" \
+	-DABISUITE_HOME="\"$(abisuite_datadir)\"" \
 	$(AF_INCLUDES) $(WP_INCLUDES) $(OTHER_INCLUDES) $(TEXT_INCLUDES) \
 	$(PLUGIN_DEFS) -I$(top_srcdir)/../abiword-plugins
 
Index: src/wp/main/unix/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/main/unix/GNUmakefile.am,v
retrieving revision 1.31
diff -a -u -p -r1.31 GNUmakefile.am
--- src/wp/main/unix/GNUmakefile.am	16 Oct 2005 13:02:07 -0000	1.31
+++ src/wp/main/unix/GNUmakefile.am	18 Sep 2006 13:20:58 -0000
@@ -24,7 +24,7 @@ bin_PROGRAMS = AbiWord-2.6
 
 INCLUDES = \
 	-DABIWORD_APP_NAME="\"$(ABIWORD_APP_NAME)\"" \
-	-DABISUITE_HOME="\"$(pkgdatadir)\"" \
+	-DABISUITE_HOME="\"$(abisuite_datadir)\"" \
 	$(AF_INCLUDES) $(WP_INCLUDES) $(OTHER_INCLUDES) $(TEXT_INCLUDES) \
 	$(PLUGIN_DEFS) -I$(top_srcdir)/../abiword-plugins \
 	$(BINRELOC_CFLAGS)
Index: src/wp/main/win/GNUmakefile.am
===================================================================
RCS file: /cvsroot/abi/src/wp/main/win/GNUmakefile.am,v
retrieving revision 1.4
diff -a -u -p -r1.4 GNUmakefile.am
--- src/wp/main/win/GNUmakefile.am	7 Dec 2005 19:01:55 -0000	1.4
+++ src/wp/main/win/GNUmakefile.am	18 Sep 2006 13:20:58 -0000
@@ -25,7 +25,7 @@ bin_PROGRAMS = AbiWord-2.6
 
 INCLUDES = \
 	-DABIWORD_APP_NAME="\"$(ABIWORD_APP_NAME)\"" \
-	-DABISUITE_HOME="\"$(pkgdatadir)\"" \
+	-DABISUITE_HOME="\"$(abisuite_datadir)\"" \
 	$(AF_INCLUDES) $(WP_INCLUDES) $(OTHER_INCLUDES) $(TEXT_INCLUDES) \
 	$(PLUGIN_DEFS) -I$(top_srcdir)/../abiword-plugins