Progress toward getting the 'make distcheck' target to successfully

compile again.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7686 57a11ea4-9604-0410-9ed3-97b8803252fd

doc/sgml/C/Makefile.am

@@ -87,7 +87,7 @@ dist-hook: gnucash/help.html gnucash/index.html gnucash/help-search-index.db
 	  cp $${dir}/help/*.html $(distdir)/gnucash; \
 	  cp $${dir}/help/figures/*.png $(distdir)/gnucash/figures; \
 	  cp $${dir}/help/*.css $(distdir)/gnucash; \
-	  cp $${dir}/help/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images) \
+	  cp $${dir}/help/stylesheet-images/*.gif $(distdir)/gnucash/stylesheet-images \
 	  cp $${dir}/guide/*.html $(distdir)/gnucash; \
 	  cp $${dir}/guide/figures/*.png $(distdir)/gnucash/figures; \
 	  cp $${dir}/guide/*.css $(distdir)/gnucash; \

src/app-file/test/Makefile.am

@@ -16,8 +16,8 @@ GNC_TEST_DEPS := \
   --guile-load-dir ${top_builddir}/src/gnome \
   --guile-load-dir ${top_srcdir}/src/gnome-utils \
   --guile-load-dir ${top_srcdir}/src/app-utils \
-  --library-dir    ${top_srcdir}/src/gnome \
-  --library-dir    ${top_srcdir}/src/gnome-utils \
+  --library-dir    ${top_builddir}/src/gnome \
+  --library-dir    ${top_builddir}/src/gnome-utils \
   --library-dir    ${G_WRAP_LIB_DIR}
 
 TESTS_ENVIRONMENT := \

src/app-utils/test/Makefile.am

@@ -20,7 +20,7 @@ GNC_TEST_DEPS := \
   --guile-load-dir ${top_builddir}/src/gnome-utils \
   --guile-load-dir ${top_builddir}/src/gnome \
   --library-dir    ${top_builddir}/src/gnome-utils \
-  --library-dir    ${top_srcdir}/src/gnome \
+  --library-dir    ${top_builddir}/src/gnome \
   --library-dir    ${G_WRAP_LIB_DIR}
 
 TESTS_ENVIRONMENT := \

src/bin/test/Makefile.am

@@ -15,9 +15,9 @@ noinst_DATA = overrides.stamp
 overrides.stamp:
 	rm -rf overrides
 	mkdir overrides
-	cd overrides && ln -s ../../overrides/gnucash .
+	cd overrides && ln -s ${top_srcdir}/src/bin/overrides/gnucash .
+	cd overrides && ln -s ${top_srcdir}/src/bin/overrides/gnucash-run-script .
 	cd overrides && ln -s ../../overrides/gnucash-make-guids .
-	cd overrides && ln -s ../../overrides/gnucash-run-script .
 	cd overrides && ln -s ../../overrides/guile .
 	cd overrides && ln -s ../../overrides/gnucash-build-env gnucash-env
 	touch overrides.stamp

src/business/business-core/file/Makefile.am

@@ -3,11 +3,11 @@ SUBDIRS = .
 pkglib_LTLIBRARIES = libgncmod-business-backend-file.la
 
 AM_CFLAGS = \
-  -I.. -I../../.. \
   -I${top_srcdir}/src/backend \
   -I${top_srcdir}/src/backend/file \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/src/business/business-core \
   ${GLIB_CFLAGS}
 
 libgncmod_business_backend_file_la_SOURCES = \

src/engine/Makefile.am

@@ -173,7 +173,7 @@ gncmod-engine.c: gw-engine.h
 gnc-commodity.c: iso-4217-currencies.c
 
 iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
-	chmod u+x ./iso-currencies-to-c
+	-chmod u+x ./iso-currencies-to-c
 	GUILE_LOAD_PATH=${top_srcdir}/lib/:${GUILE_LOAD_PATH} ${srcdir}/iso-currencies-to-c
 
 gw-engine.scm gw-engine.c gw-engine.h: .scm-links gw-engine-spec.scm

src/engine/messages.c

@@ -37,7 +37,7 @@
 /***
  * gnc_qualifier_prefix_gettext
  **/
-gchar *
+const gchar *
 gnc_qualifier_prefix_gettext (const gchar *string)
 {
         g_return_val_if_fail (string, NULL);
@@ -45,14 +45,14 @@ gnc_qualifier_prefix_gettext (const gchar *string)
 	if (*string != Q_PREFIX_START) {
 		return gettext (string);
 	} else {
-		gchar *translation;
+		const gchar *translation;
 
 		translation = gettext (string);
 		if (translation != string) {
 			if (*translation != Q_PREFIX_START) {
 				return translation;
 			} else {
-				gchar *real_translation;
+				const gchar *real_translation;
 
 				real_translation = strchr (translation + 1, Q_PREFIX_END);
 				if (real_translation != NULL) {

src/engine/messages.h

@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-char *gnc_qualifier_prefix_gettext (const char *s);
+const char *gnc_qualifier_prefix_gettext (const char *s);
 char *gnc_qualifier_prefix_noop (const char *s);
 
 #if defined(HAVE_GETTEXT)             /* HAVE_GETTEXT */
@@ -44,6 +44,7 @@ char *gnc_qualifier_prefix_noop (const char *s);
 #endif		                      /* End ENABLE_GETTEXT_UNDERSCORE */
 
 #else                                 /* Not HAVE_GETTEXT */
+#if !defined(__USE_GNU_GETTEXT)
 
 #undef _
 #undef Q_
@@ -54,6 +55,7 @@ char *gnc_qualifier_prefix_noop (const char *s);
 #define ngettext(msgid, msgid_plural, n) (((n)==1) ? \
                                             (msgid) : (msgid_plural))
 
+#endif                                /* End not__USE_GNU_GETTEXT */
 #endif                                /* End Not HAVE_GETTEXT */
 
 #undef  N_

src/quotes/Makefile.am

@@ -7,6 +7,7 @@ gncshare_SCRIPTS = finance-quote-helper finance-quote-check
 EXTRA_DIST = \
   .cvsignore \
   Quote_example.pl \
+  finance-quote-check.in \
   finance-quote-helper.in \
   gnc-prices \
   update-finance-quote.in \

src/report/stylesheets/test/Makefile.am

@@ -11,6 +11,7 @@ GNC_TEST_DEPS := \
   --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/gnome-utils \
   --gnc-module-dir ${top_builddir}/src/network-utils \
+  --gnc-module-dir ${top_srcdir}/src/gnome-utils \
   --gnc-module-dir ${top_srcdir}/src/gnc-module \
   --gnc-module-dir ${top_srcdir}/src/engine \
   --guile-load-dir ${top_srcdir}/src/scm \