* FAQ: Several minor corrections. New question about bug reports.

* Makefile.am, Makefile.in: Add FAQ to EXTRA_DIST.


svn: r2385

gramps2/ChangeLog

@@ -1,3 +1,7 @@
+2003-11-25  Alex Roitman  <shura@alex.neuro.umn.edu>
+	* FAQ: Several minor corrections. New question about bug reports.
+	* Makefile.am, Makefile.in: Add FAQ to EXTRA_DIST.
+
 2003-11-25  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/Utils.py (search_for): check for directory
 

gramps2/FAQ

@@ -277,6 +277,10 @@ of contacting you should we need more information. If you choose to file your
 report anonymously, at least check every so often whether your report page 
 has something new posted, as it probably would.
 
+If the above explanations seem vague, please follow this link
+http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
+
+
 *** End of GRAMPS Frequently Asked Questions ***
 
 $Id$

gramps2/Makefile.am

@@ -2,7 +2,7 @@
 
 SUBDIRS = src doc example
 
-EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS
+EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS FAQ
 
 bin_SCRIPTS = gramps
 

gramps2/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.7.8 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,75 +15,73 @@
 @SET_MAKE@
 
 # copyright (C) 2000 Sun Microsystems, Inc.
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
+
-AMDEP_FALSE = @AMDEP_FALSE@
+EXEEXT = @EXEEXT@
-AMDEP_TRUE = @AMDEP_TRUE@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BINSH = @BINSH@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 ICONV = @ICONV@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LANGUAGES = @LANGUAGES@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 MSGCONV = @MSGCONV@
 MSGFMT = @MSGFMT@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
 PYTHON = @PYTHON@
 PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
@@ -93,48 +91,23 @@ PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@
 RELEASE = @RELEASE@
 SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 SK_CONFIG = @SK_CONFIG@
 STRIP = @STRIP@
 SWIG = @SWIG@
 VERSION = @VERSION@
 VERSIONSTRING = @VERSIONSTRING@
 ZIP = @ZIP@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
-am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 
 SUBDIRS = src doc example
 
-EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS
+EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS FAQ
 
 bin_SCRIPTS = gramps
 
@@ -147,15 +120,14 @@ SCRIPTS = $(bin_SCRIPTS)
 
 DIST_SOURCES =
 
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
-	check-recursive installcheck-recursive
+DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+	Makefile.in NEWS TODO aclocal.m4 configure configure.in \
-	COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
+	gramps.sh.in gramps.spec.in install-sh missing mkinstalldirs \
-	configure configure.in gramps.sh.in gramps.spec.in install-sh \
+	py-compile
-	missing mkinstalldirs py-compile
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
@@ -256,17 +228,10 @@ tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
 
 ETAGS = etags
 ETAGSFLAGS =
 
-CTAGS = ctags
-CTAGSFLAGS =
-
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -282,15 +247,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -303,28 +262,13 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
 
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = .
@@ -336,20 +280,13 @@ am__remove_distdir = \
          && rm -fr $(distdir); }; }
 
 GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
 	$(mkinstalldirs) $(distdir)/. $(distdir)/src
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@list='$(DISTFILES)'; for file in $$list; do \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -383,7 +320,7 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
 	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
@@ -405,13 +342,12 @@ distcheck: dist
 	$(am__remove_distdir)
 	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
 	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
+	mkdir $(distdir)/=build
-	mkdir $(distdir)/_inst
+	mkdir $(distdir)/=inst
 	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/=build \
-	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -419,39 +355,23 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
-	        distuninstallcheck \
+	      || { echo "ERROR: files left after uninstall:" ; \
-	  && chmod -R a-w "$$dc_install_base" \
+	           find $$dc_install_base -type f -print ; \
-	  && ({ \
+	           exit 1; } >&2 ) \
-	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
 	  && rm -f $(distdir).tar.gz \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
 	$(am__remove_distdir)
 	@echo "$(distdir).tar.gz is ready for distribution" | \
 	  sed 'h;s/./=/g;p;x;p;x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
 distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
+	if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	  || { echo "ERROR: files left after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
@@ -481,7 +401,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -492,7 +412,6 @@ clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
@@ -515,31 +434,21 @@ installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf autom4te.cache
-	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
 uninstall-am: uninstall-binSCRIPTS uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-generic clean-recursive ctags ctags-recursive dist \
+	clean-generic clean-recursive dist dist-all dist-gzip distcheck \
-	dist-all dist-gzip distcheck distclean distclean-generic \
+	distclean distclean-generic distclean-recursive distclean-tags \
-	distclean-recursive distclean-tags distcleancheck distdir \
+	distcleancheck distdir dvi dvi-am dvi-recursive info info-am \
-	distuninstallcheck dvi dvi-am dvi-recursive info info-am \
 	info-recursive install install-am install-binSCRIPTS \
 	install-data install-data-am install-data-recursive \
 	install-exec install-exec-am install-exec-recursive \
@@ -548,10 +457,9 @@ uninstall-info: uninstall-info-recursive
 	installdirs installdirs-am installdirs-recursive \
 	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
+	mostlyclean-recursive tags tags-recursive uninstall \
-	ps-recursive tags tags-recursive uninstall uninstall-am \
+	uninstall-am uninstall-binSCRIPTS uninstall-info-am \
-	uninstall-binSCRIPTS uninstall-info-am uninstall-info-recursive \
+	uninstall-info-recursive uninstall-recursive
-	uninstall-recursive
 
 
 gramps: gramps.sh