* Makefiles: updated for installation

* src/data/gnome-mime-application-x-gramps.png: new icon * src/data/gramps.svg: new icon * src/data/gramps.xml: mime information svn: r3195
2004-05-27 04:29:43 +00:00
parent 8943c5e171
commit 4caf81273c
19 changed files with 585 additions and 159 deletions
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-26  Don Allingham  <dallingham@users.sourceforge.net>
+	* Makefiles: updated for installation
+	* src/data/gnome-mime-application-x-gramps.png: new icon
+	* src/data/gramps.svg: new icon
+	* src/data/gramps.xml: mime information
+
 2004-05-25  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/RelLib.py (try_to_find_person_from_id): Remove transaction;
 	(try_to_find_source_from_id, try_to_find_object_from_id,
--- a/gramps2/gramps-mdk.spec
+++ b/gramps2/gramps-mdk.spec
@@ -1,5 +1,5 @@
 %define ver      1.1.0
-%define rel      0.CVS20040519
+%define rel      0.CVS20040525
 %define prefix   /usr
 %define localstatedir /var/lib
 # Ensure that internal RPM macros for configure & makeinstall 
--- a/gramps2/gramps.sh.in
+++ b/gramps2/gramps.sh.in
@@ -25,8 +25,7 @@ exec_prefix=@exec_prefix@
 PACKAGE=@PACKAGE@

 export GRAMPSDIR=@datadir@/@PACKAGE@
-export GRAMPSPYDIR=@pkgpythondir@
-export GRAMPSPLUGINSDIR=$GRAMPSPYDIR/plugins:$GRAMPSPYDIR/docgen:$GRAMPSPYDIR/filters
+export GRAMPSPLUGINSDIR=$GRAMPDIR/plugins:$GRAMPSDIR/docgen
 export GRAMPSLIBDIR=@libdir@/@PACKAGE@
 export GRAMPSI18N=@prefix@/share/locale

@@ -37,4 +36,4 @@ else
    export PYTHONPATH=$GRAMPSDIR:$GRAMPSLIBDIR:$GRAMPSPLUGINSDIR:$PYTHONPATH
 fi

-exec @PYTHON@ $GRAMPSPYDIR/gramps.py $*
+exec @PYTHON@ $GRAMPSDIR/gramps.py $*
--- a/gramps2/gramps.spec
+++ b/gramps2/gramps.spec
@@ -1,5 +1,5 @@
 %define ver      1.1.0
-%define rel      0.CVS20040519
+%define rel      0.CVS20040525
 %define prefix   /usr
 %define localstatedir /var/lib
 # Ensure that internal RPM macros for configure & makeinstall 
--- a/gramps2/src/Makefile.am
+++ b/gramps2/src/Makefile.am
@@ -10,7 +10,9 @@ MOSTLYCLEANFILES =
 # In principle, this is handled by PYCFILES and PYOFILES, but
 # they don't seem to work so we edited the py-compile script instead

-pkgpython_PYTHON = \
+gdirdir=$(DESTDIR)$(prefix)/share/gramps
+
+gdir_PYTHON = \
 	AddMedia.py\
 	AddrEdit.py\
 	AddSpouse.py\
@@ -20,11 +22,13 @@ pkgpython_PYTHON = \
 	BaseDoc.py\
 	Bookmarks.py\
 	Calendar.py\
+	ColumnOrder.py\
 	ChooseParents.py\
 	const.py\
 	DateEdit.py\
 	Date.py\
 	DbPrompter.py\
+	DisplayModels.py\
 	DisplayTrace.py\
 	EditPerson.py\
 	EditPlace.py\
@@ -38,6 +42,7 @@ pkgpython_PYTHON = \
 	GedcomInfo.py\
 	GenericFilter.py\
 	GrampsCfg.py\
+	GrampsMime.py\
 	gramps_main.py\
 	gramps.py\
 	GraphLayout.py\
@@ -78,6 +83,7 @@ pkgpython_PYTHON = \
 	StyleEditor.py\
 	SubstKeywords.py\
 	TarFile.py\
+	TipOfDay.py\
 	TransTable.py\
 	UrlEdit.py\
 	Utils.py\
@@ -101,6 +107,7 @@ GRAPHICS = \
 	edit.png\
 	family48.png\
 	good.png\
+	home.png\
 	gramps.png\
 	logo.png\
 	media.png\
@@ -111,7 +118,7 @@ GRAPHICS = \
 	tools.png

 # Other stuff that we need to install
-dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) 

 # In principle the following rule slightly  violates the automake/autoconf 
 # spirit of keeping each subdirectory as a separate entity unto itself. 
@@ -126,14 +133,5 @@ pycheck:
 	for d in $(SUBDIRS) ; do \
          (cd $$d; make pycheck); \
 	done;
-	pychecker $(pkgpython_PYTHON)
+	pychecker $(gdir_PYTHON)

-install-data-local:
-	$(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps
-	$(INSTALL_DATA) $(srcdir)/gramps.png $(DESTDIR)$(prefix)/share/pixmaps
-	$(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications
-	$(INSTALL_DATA) $(srcdir)/gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications
-
-uninstall-local:
-	-rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png
-	-rm $(DESTDIR)$(prefix)/share/gnome/apps/Applications/gramps.desktop
--- a/gramps2/src/Makefile.in
+++ b/gramps2/src/Makefile.in
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = src
-DIST_COMMON = README $(dist_pkgdata_DATA) $(pkgpython_PYTHON) \
+DIST_COMMON = README $(dist_pkgdata_DATA) $(gdir_PYTHON) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/const.py.in AUTHORS ChangeLog NEWS
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -52,8 +52,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-recursive installcheck-recursive installdirs-recursive \
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive
-am__installdirs = "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(pkgdatadir)"
-pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
+am__installdirs = "$(DESTDIR)$(gdirdir)" "$(DESTDIR)$(pkgdatadir)"
+gdirPYTHON_INSTALL = $(INSTALL_DATA)
 py_compile = $(top_srcdir)/py-compile
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
@@ -150,7 +150,8 @@ MOSTLYCLEANFILES =
 # We only want optimized byte-compiled (.pyo) versions, no .pyc
 # In principle, this is handled by PYCFILES and PYOFILES, but
 # they don't seem to work so we edited the py-compile script instead
-pkgpython_PYTHON = \
+gdirdir = $(DESTDIR)$(prefix)/share/gramps
+gdir_PYTHON = \
 	AddMedia.py\
 	AddrEdit.py\
 	AddSpouse.py\
@@ -160,11 +161,13 @@ pkgpython_PYTHON = \
 	BaseDoc.py\
 	Bookmarks.py\
 	Calendar.py\
+	ColumnOrder.py\
 	ChooseParents.py\
 	const.py\
 	DateEdit.py\
 	Date.py\
 	DbPrompter.py\
+	DisplayModels.py\
 	DisplayTrace.py\
 	EditPerson.py\
 	EditPlace.py\
@@ -178,6 +181,7 @@ pkgpython_PYTHON = \
 	GedcomInfo.py\
 	GenericFilter.py\
 	GrampsCfg.py\
+	GrampsMime.py\
 	gramps_main.py\
 	gramps.py\
 	GraphLayout.py\
@@ -218,6 +222,7 @@ pkgpython_PYTHON = \
 	StyleEditor.py\
 	SubstKeywords.py\
 	TarFile.py\
+	TipOfDay.py\
 	TransTable.py\
 	UrlEdit.py\
 	Utils.py\
@@ -242,6 +247,7 @@ GRAPHICS = \
 	edit.png\
 	family48.png\
 	good.png\
+	home.png\
 	gramps.png\
 	logo.png\
 	media.png\
@@ -253,7 +259,7 @@ GRAPHICS = \


 # Other stuff that we need to install
-dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) gramps.desktop
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) 
 all: all-recursive

 .SUFFIXES:
@@ -289,28 +295,28 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 const.py: $(top_builddir)/config.status $(srcdir)/const.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 uninstall-info-am:
-install-pkgpythonPYTHON: $(pkgpython_PYTHON)
+install-gdirPYTHON: $(gdir_PYTHON)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgpythondir)" || $(mkdir_p) "$(DESTDIR)$(pkgpythondir)"
-	@list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
+	test -z "$(gdirdir)" || $(mkdir_p) "$(DESTDIR)$(gdirdir)"
+	@list='$(gdir_PYTHON)'; dlist=''; for p in $$list; do\
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
 	    d=`echo $$p | sed -e 's,^.*/,,'`; \
 	    dlist="$$dlist $$d"; \
-	    echo " $(pkgpythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgpythondir)/$$d'"; \
-	    $(pkgpythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgpythondir)/$$d"; \
+	    echo " $(gdirPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(gdirdir)/$$d'"; \
+	    $(gdirPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(gdirdir)/$$d"; \
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pkgpythondir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gdirdir)" $$dlist

-uninstall-pkgpythonPYTHON:
+uninstall-gdirPYTHON:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
+	@list='$(gdir_PYTHON)'; dlist=''; for p in $$list; do\
 	  d=`echo $$p | sed -e 's,^.*/,,'`; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$$d"; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$${d}c"; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$${d}o"; \
+	  rm -f "$(DESTDIR)$(gdirdir)/$$d"; \
+	  rm -f "$(DESTDIR)$(gdirdir)/$${d}c"; \
+	  rm -f "$(DESTDIR)$(gdirdir)/$${d}o"; \
 	done
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
@@ -495,7 +501,7 @@ check: check-recursive
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(pkgdatadir)"; do \
+	for dir in "$(DESTDIR)$(gdirdir)" "$(DESTDIR)$(pkgdatadir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -541,8 +547,7 @@ info: info-recursive

 info-am:

-install-data-am: install-data-local install-dist_pkgdataDATA \
-	install-pkgpythonPYTHON
+install-data-am: install-dist_pkgdataDATA install-gdirPYTHON

 install-exec-am:

@@ -568,8 +573,8 @@ ps: ps-recursive

 ps-am:

-uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am \
-	uninstall-local uninstall-pkgpythonPYTHON
+uninstall-am: uninstall-dist_pkgdataDATA uninstall-gdirPYTHON \
+	uninstall-info-am

 uninstall-info: uninstall-info-recursive

@@ -577,16 +582,15 @@ uninstall-info: uninstall-info-recursive
 	clean clean-generic clean-recursive ctags ctags-recursive \
 	distclean distclean-generic distclean-recursive distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-data-local \
+	install-am install-data install-data-am \
 	install-dist_pkgdataDATA install-exec install-exec-am \
-	install-info install-info-am install-man \
-	install-pkgpythonPYTHON install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-dist_pkgdataDATA uninstall-info-am uninstall-local \
-	uninstall-pkgpythonPYTHON
+	install-gdirPYTHON install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_pkgdataDATA \
+	uninstall-gdirPYTHON uninstall-info-am


 # In principle the following rule slightly  violates the automake/autoconf 
@@ -602,17 +606,7 @@ pycheck:
 	for d in $(SUBDIRS) ; do \
          (cd $$d; make pycheck); \
 	done;
-	pychecker $(pkgpython_PYTHON)
-
-install-data-local:
-	$(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps
-	$(INSTALL_DATA) $(srcdir)/gramps.png $(DESTDIR)$(prefix)/share/pixmaps
-	$(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications
-	$(INSTALL_DATA) $(srcdir)/gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications
-
-uninstall-local:
-	-rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png
-	-rm $(DESTDIR)$(prefix)/share/gnome/apps/Applications/gramps.desktop
+	pychecker $(gdir_PYTHON)
 # 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:
--- a/gramps2/src/calendars/Makefile.am
+++ b/gramps2/src/calendars/Makefile.am
@@ -2,14 +2,12 @@
 # Use GNU make's ':=' syntax for nice wildcard use.
 # If not using GNU make, then list all .py files individually

-pkgpython_PYTHON = \
+calendardir = $(datadir)/@PACKAGE@/calendars
+
+calendar_PYTHON = \
 	Islamic.py \
 	Persian.py

-pkgpyexecdir = @pkgpyexecdir@/plugins
-pkgpythondir = @pkgpythondir@/plugins
-
-pkgdatadir = $(datadir)/@PACKAGE@/calendars

 GRAMPS_PY_MODPATH = "../"

--- a/gramps2/src/calendars/Makefile.in
+++ b/gramps2/src/calendars/Makefile.in
@@ -20,6 +20,7 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
@@ -37,7 +38,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = src/calendars
-DIST_COMMON = $(pkgpython_PYTHON) $(srcdir)/Makefile.am \
+DIST_COMMON = $(calendar_PYTHON) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -47,11 +48,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__installdirs = "$(DESTDIR)$(pkgpythondir)"
-pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
+am__installdirs = "$(DESTDIR)$(calendardir)"
+calendarPYTHON_INSTALL = $(INSTALL_DATA)
 py_compile = $(top_srcdir)/py-compile
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/@PACKAGE@/calendars
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -119,8 +119,8 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-pkgpyexecdir = @pkgpyexecdir@/plugins
-pkgpythondir = @pkgpythondir@/plugins
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 pyexecdir = @pyexecdir@
@@ -129,7 +129,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-pkgpython_PYTHON = \
+calendardir = $(datadir)/@PACKAGE@/calendars
+calendar_PYTHON = \
 	Islamic.py \
 	Persian.py

@@ -167,28 +168,28 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
-install-pkgpythonPYTHON: $(pkgpython_PYTHON)
+install-calendarPYTHON: $(calendar_PYTHON)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgpythondir)" || $(mkdir_p) "$(DESTDIR)$(pkgpythondir)"
-	@list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
+	test -z "$(calendardir)" || $(mkdir_p) "$(DESTDIR)$(calendardir)"
+	@list='$(calendar_PYTHON)'; dlist=''; for p in $$list; do\
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
 	    d=`echo $$p | sed -e 's,^.*/,,'`; \
 	    dlist="$$dlist $$d"; \
-	    echo " $(pkgpythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgpythondir)/$$d'"; \
-	    $(pkgpythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgpythondir)/$$d"; \
+	    echo " $(calendarPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(calendardir)/$$d'"; \
+	    $(calendarPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(calendardir)/$$d"; \
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pkgpythondir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(calendardir)" $$dlist

-uninstall-pkgpythonPYTHON:
+uninstall-calendarPYTHON:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
+	@list='$(calendar_PYTHON)'; dlist=''; for p in $$list; do\
 	  d=`echo $$p | sed -e 's,^.*/,,'`; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$$d"; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$${d}c"; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$${d}o"; \
+	  rm -f "$(DESTDIR)$(calendardir)/$$d"; \
+	  rm -f "$(DESTDIR)$(calendardir)/$${d}c"; \
+	  rm -f "$(DESTDIR)$(calendardir)/$${d}o"; \
 	done
 tags: TAGS
 TAGS:
@@ -228,7 +229,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile
 installdirs:
-	for dir in "$(DESTDIR)$(pkgpythondir)"; do \
+	for dir in "$(DESTDIR)$(calendardir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -273,7 +274,7 @@ info: info-am

 info-am:

-install-data-am: install-pkgpythonPYTHON
+install-data-am: install-calendarPYTHON

 install-exec-am:

@@ -299,17 +300,17 @@ ps: ps-am

 ps-am:

-uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON
+uninstall-am: uninstall-calendarPYTHON uninstall-info-am

 .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-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pkgpythonPYTHON install-strip installcheck \
+	install install-am install-calendarPYTHON install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-pkgpythonPYTHON
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-calendarPYTHON uninstall-info-am


 pycheck: 
--- a/gramps2/src/data/Makefile.am
+++ b/gramps2/src/data/Makefile.am
@@ -2,7 +2,27 @@
 SUBDIRS = templates
 pkgdatadir = $(datadir)/@PACKAGE@/data

-pkgdata_DATA = gedcom.xml papersize.xml
+pkgdata_DATA = gedcom.xml \
+	       papersize.xml \
+	       tips.xml \
+	       gnome-mime-application-x-gramps.png \
+	       gramps.svg

 EXTRA_DIST = $(pkgdata_DATA)

+install-data-local:
+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps
+	$(INSTALL_DATA) gramps.png $(DESTDIR)$(prefix)/share/pixmaps
+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications
+	$(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications
+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
+	$(INSTALL_DATA) gnome-mime-application-x-gramps.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/mime/packages
+	$(INSTALL_DATA) gramps.xml $(DESTDIR)$(prefix)/share/mime/packages
+	update-mime-database $(DESTDIR)$(prefix)/share/mime
+
+uninstall-local:
+	-rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png
+	-rm $(DESTDIR)$(prefix)/share/gnome/apps/Applications/gramps.desktop
+	-rm $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gramps.png
+
--- a/gramps2/src/data/Makefile.in
+++ b/gramps2/src/data/Makefile.in
@@ -137,7 +137,12 @@ target_alias = @target_alias@

 # This is the src/data level Makefile
 SUBDIRS = templates
-pkgdata_DATA = gedcom.xml papersize.xml
+pkgdata_DATA = gedcom.xml \
+	       papersize.xml \
+	       tips.xml \
+	       gnome-mime-application-x-gramps.png \
+	       gramps.svg
+
 EXTRA_DIST = $(pkgdata_DATA)
 all: all-recursive

@@ -400,7 +405,7 @@ info: info-recursive

 info-am:

-install-data-am: install-pkgdataDATA
+install-data-am: install-data-local install-pkgdataDATA

 install-exec-am:

@@ -426,7 +431,7 @@ ps: ps-recursive

 ps-am:

-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+uninstall-am: uninstall-info-am uninstall-local uninstall-pkgdataDATA

 uninstall-info: uninstall-info-recursive

@@ -434,15 +439,31 @@ uninstall-info: uninstall-info-recursive
 	clean clean-generic clean-recursive ctags ctags-recursive \
 	distclean distclean-generic distclean-recursive distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pkgdataDATA install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
+	install-am install-data install-data-am install-data-local \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-pkgdataDATA install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic maintainer-clean-recursive \
 	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-pkgdataDATA
+	uninstall-info-am uninstall-local uninstall-pkgdataDATA

+
+install-data-local:
+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps
+	$(INSTALL_DATA) gramps.png $(DESTDIR)$(prefix)/share/pixmaps
+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications
+	$(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/gnome/apps/Applications
+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
+	$(INSTALL_DATA) gnome-mime-application-x-gramps.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/mime/packages
+	$(INSTALL_DATA) gramps.xml $(DESTDIR)$(prefix)/share/mime/packages
+	update-mime-database $(DESTDIR)$(prefix)/share/mime
+
+uninstall-local:
+	-rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png
+	-rm $(DESTDIR)$(prefix)/share/gnome/apps/Applications/gramps.desktop
+	-rm $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gramps.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:
--- a/gramps2/src/data/gnome-mime-application-x-gramps.png
+++ b/gramps2/src/data/gnome-mime-application-x-gramps.png
--- a/gramps2/src/data/gramps.desktop
+++ b/gramps2/src/data/gramps.desktop
@@ -21,3 +21,5 @@ Type=Application
 StartupNotify=true
 Categories=Application;Genealogy;
 X-GNOME-DocPath=gramps/gramps-manual.xml
+MimeType=application/x-gramps
+Exec=gramps %F
--- a/gramps2/src/data/gramps.png
+++ b/gramps2/src/data/gramps.png
--- a/gramps2/src/data/gramps.svg
+++ b/gramps2/src/data/gramps.svg
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
+"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+   id="svg602"
+   sodipodi:version="0.34"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   width="500pt"
+   height="500pt"
+   xml:space="preserve"
+   sodipodi:docbase="/home/digitect"
+   sodipodi:docname="/home/digitect/gramps.svg"><defs
+   id="defs604"><linearGradient
+   id="linearGradient627"><stop
+   style="stop-color:#7f7f7f;stop-opacity:1;"
+   offset="0"
+   id="stop628" /><stop
+   style="stop-color:#000000;stop-opacity:0;"
+   offset="1"
+   id="stop629" /></linearGradient><linearGradient
+   xlink:href="#linearGradient627"
+   id="linearGradient630" /><radialGradient
+   xlink:href="#linearGradient627"
+   id="radialGradient631"
+   cx="0.4920629"
+   cy="0.48437563"
+   r="0.7127381"
+   fx="0.4920629"
+   fy="0.48437563" /><radialGradient
+   xlink:href="#linearGradient627"
+   id="radialGradient634"
+   cx="0.5"
+   cy="0.5"
+   r="0.5"
+   fx="0.5"
+   fy="0.5" /><radialGradient
+   xlink:href="#linearGradient627"
+   id="radialGradient637"
+   cx="0.49542692"
+   cy="0.53518981"
+   r="0.55758011"
+   fx="0.49542692"
+   fy="0.53518981"
+   gradientTransform="scale(1.038947,0.962513)"
+   gradientUnits="objectBoundingBox" /></defs><sodipodi:namedview
+   id="base" /><path
+   style="font-size:12;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.036376;"
+   d="M 156.0099 324.2898 L 204.6063 324.2898 "
+   id="path617" /><path
+   style="fill:none;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:12.5;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"
+   d="M 239.7523 190.8234 L 204.6063 191.0687 L 206.2821 456.673 L 238.6627 456.6221 "
+   id="path618"
+   sodipodi:nodetypes="cccc" /><path
+   style="font-size:12;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:13.13064;stroke-opacity:0.2695;"
+   d="M 155.172 333.5064 L 208.7956 333.5064 "
+   id="path638" /><path
+   style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-opacity:0.2695;stroke-width:12.5;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"
+   d="M 465.4795 398.8601 L 431.1269 398.7585 L 431.6686 532.0811 L 465.7758 532.2757 "
+   id="path640"
+   sodipodi:nodetypes="cccc" /><path
+   style="font-size:12;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:13.30727;stroke-opacity:0.2695;"
+   d="M 367.1527 199.4475 L 424.1279 199.4475 "
+   id="path641" /><path
+   style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-opacity:0.2695;stroke-width:12.5;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"
+   d="M 466.4191 119.9008 L 429.9928 119.85 L 430.7291 253.3673 L 464.2946 253.3164 "
+   id="path642"
+   sodipodi:nodetypes="cccc" /><path
+   style="font-size:12;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:13.59266;stroke-opacity:0.2695;"
+   d="M 364.8845 465.0517 L 425.0302 465.0517 "
+   id="path643"
+   sodipodi:nodetypes="cc" /><path
+   style="fill:none;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:12.5;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"
+   d="M 453.8511 110.6842 L 417.4248 110.6334 L 418.1611 244.1507 L 451.7266 244.0998 "
+   id="path622"
+   sodipodi:nodetypes="cccc" /><path
+   style="font-size:12;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:12.5;stroke-dasharray:none;"
+   d="M 370.5042 190.2309 L 420.7764 190.2309 "
+   id="path621" /><path
+   style="font-size:12;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:12.5;stroke-dasharray:none;"
+   d="M 369.9117 456.673 L 420.7764 456.673 "
+   id="path623"
+   sodipodi:nodetypes="cc" /><path
+   style="fill:none;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:12.5;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"
+   d="M 452.9115 389.6435 L 418.5589 389.5419 L 419.1006 522.8645 L 453.2078 523.0591 "
+   id="path620"
+   sodipodi:nodetypes="cccc" /><path
+   style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-opacity:0.2695;stroke-width:12.5;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"
+   d="M 251.8231 200.04 L 217.1743 200.2853 L 218.8501 465.8896 L 251.2307 465.8387 "
+   id="path639"
+   sodipodi:nodetypes="cccc" /><path
+   style="fill:none;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-width:12.5;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;stroke-dasharray:none;"
+   d="M 156.01 325.1277 L 202.0927 325.1277 "
+   id="path614" /><path
+   style="fill:#70d4bc;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 152.47 221.4361 C 258.0944 269.1659 258.0944 269.1659 258.0944 269.1659 "
+   id="path664" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.875;stroke-linecap:square;stroke-dasharray:none;"
+   d="M 211.973 452.3667 C 211.9525 452.3929 237.9633 452.4482 237.9633 452.4482 L 237.9639 452.4482 "
+   id="path670"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.865471;stroke-linecap:square;stroke-opacity:1;"
+   d="M 201.9894 460.6508 C 202.0165 460.7533 201.1578 331.1745 201.1578 331.1745 L 201.1577 331.1716 "
+   id="path671"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.875;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;"
+   d="M 201.2082 320.0251 C 201.2352 320.1305 200.3765 187.0357 200.3765 187.0357 L 200.3764 187.0326 "
+   id="path672"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.875;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;"
+   d="M 200.3291 186.9318 C 200.2993 186.9585 238.5676 186.6442 238.5676 186.6442 L 238.5683 186.6442 "
+   id="path673"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.875;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;"
+   d="M 157.2396 321.2826 C 157.2053 321.3093 201.2233 320.995 201.2233 320.995 L 201.2241 320.995 "
+   id="path674"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.869468;stroke-linecap:square;"
+   d="M 414.0218 185.6494 C 414.0488 185.7122 413.1901 106.5653 413.1901 106.5653 L 413.19 106.5634 "
+   id="path875"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.875;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1;"
+   d="M 414.7052 106.6189 C 414.6754 106.6456 452.9437 106.3313 452.9437 106.3313 L 452.9444 106.3313 "
+   id="path876"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.841395;stroke-linecap:square;"
+   d="M 371.6157 186.5944 C 371.5826 186.6211 414.0369 186.3068 414.0369 186.3068 L 414.0377 186.3068 "
+   id="path877"
+   sodipodi:nodetypes="ccc" /><rect
+   style="font-size:12;fill:url(#radialGradient631);fill-rule:evenodd;stroke:none;stroke-width:0;stroke-dashoffset:5;stroke-opacity:1;stroke-dasharray:none;fill-opacity:0.2908;"
+   id="rect644"
+   width="136.531754"
+   height="99.1997147"
+   x="247.502472"
+   y="151.233978" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.875;stroke-linecap:square;stroke-dasharray:none;"
+   d="M 423.7126 239.8883 C 423.6909 239.9145 451.1822 239.9698 451.1822 239.9698 L 451.1828 239.9698 "
+   id="path878"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.874993;stroke-linecap:square;"
+   d="M 414.0284 247.8598 C 414.0555 247.9007 413.8233 196.5997 413.8233 196.5997 L 413.8232 196.5986 "
+   id="path879"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.874995;stroke-linecap:square;"
+   d="M 414.7178 452.2609 C 414.7446 452.3139 414.4684 385.5465 414.4684 385.5465 L 414.4683 385.5449 "
+   id="path880"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.875;stroke-linecap:square;stroke-dasharray:none;"
+   d="M 415.2487 385.6363 C 415.2193 385.6828 452.1647 385.5016 452.1647 385.5016 L 452.1653 385.5016 "
+   id="path881"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.841395;stroke-linecap:square;"
+   d="M 371.2783 452.761 C 371.2452 452.7877 413.6995 452.4734 413.6995 452.4734 L 413.7003 452.4734 "
+   id="path882"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.875;stroke-linecap:square;stroke-dasharray:none;"
+   d="M 424.6743 518.715 C 424.6524 518.7412 452.3001 518.7965 452.3001 518.7965 L 452.3007 518.7965 "
+   id="path884"
+   sodipodi:nodetypes="ccc" /><path
+   style="font-size:12;fill:#d7d7d7;fill-rule:evenodd;stroke:#b8b8b8;stroke-width:1.875;stroke-linecap:square;stroke-dasharray:none;"
+   d="M 415.4588 526.8428 C 415.4859 526.8941 415.2537 462.5457 415.2537 462.5457 L 415.2536 462.5443 "
+   id="path885"
+   sodipodi:nodetypes="ccc" /><rect
+   style="font-size:12;fill:url(#radialGradient631);fill-rule:evenodd;stroke:none;stroke-width:0;stroke-dashoffset:5;stroke-opacity:1;stroke-dasharray:none;fill-opacity:0.2908;"
+   id="rect886"
+   width="136.531754"
+   height="99.1997147"
+   x="246.252472"
+   y="419.360764" /><rect
+   style="font-size:12;fill:url(#radialGradient631);fill-rule:evenodd;stroke:none;stroke-width:0;stroke-dashoffset:5;stroke-opacity:1;stroke-dasharray:none;fill-opacity:0.2908;"
+   id="rect887"
+   width="136.531754"
+   height="99.1997147"
+   x="31.2510834"
+   y="286.234879" /><rect
+   style="font-size:12;fill:url(#radialGradient631);fill-rule:evenodd;stroke:none;stroke-width:0;stroke-dashoffset:5;stroke-opacity:1;stroke-dasharray:none;fill-opacity:0.2908;"
+   id="rect888"
+   width="136.531754"
+   height="99.1997147"
+   x="460.003845"
+   y="69.3584442" /><rect
+   style="font-size:12;fill:url(#radialGradient631);fill-rule:evenodd;stroke:none;stroke-width:0;stroke-dashoffset:5;stroke-opacity:1;stroke-dasharray:none;fill-opacity:0.2908;"
+   id="rect889"
+   width="136.531754"
+   height="99.1997147"
+   x="458.753845"
+   y="204.359283" /><rect
+   style="font-size:12;fill:url(#radialGradient631);fill-rule:evenodd;stroke:none;stroke-width:0;stroke-dashoffset:5;stroke-opacity:1;stroke-dasharray:none;fill-opacity:0.2908;"
+   id="rect890"
+   width="136.531754"
+   height="99.1997147"
+   x="459.378845"
+   y="348.735275" /><rect
+   style="font-size:12;fill:url(#radialGradient631);fill-rule:evenodd;stroke:none;stroke-width:0;stroke-dashoffset:5;stroke-opacity:1;stroke-dasharray:none;fill-opacity:0.2908;"
+   id="rect892"
+   width="136.531754"
+   height="99.1997147"
+   x="460.003845"
+   y="483.736099" /><g
+   id="g711"
+   transform="translate(168.9851,300.1636)"
+   style="font-size:12;"><rect
+   style="font-size:12;fill:#ead4bc;fill-rule:evenodd;stroke:#b39166;stroke-width:12.5;stroke-dashoffset:5;fill-opacity:1;stroke-dasharray:none;"
+   id="rect712"
+   width="118.977303"
+   height="81.2732315"
+   x="290.74028"
+   y="182.763062" /><path
+   style="fill:#d4b993;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.4987 176.5118 L 415.9331 176.5096 L 403.4166 189.0328 L 296.9416 188.9893 L 284.4987 176.5118 z "
+   id="path713"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#b39a7d;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.5556 176.58 L 296.9299 188.9543 L 296.8747 257.6765 L 284.5555 270.106 L 284.5556 176.58 z "
+   id="path714"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#887058;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 415.9927 176.7363 L 403.6184 189.1105 L 403.6736 257.8327 L 415.9928 270.2622 L 415.9927 176.7363 z "
+   id="path715"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#695144;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 416.0892 270.2808 L 284.6549 270.283 L 297.1714 257.7598 L 403.6463 257.8033 L 416.0892 270.2808 z "
+   id="path716"
+   sodipodi:nodetypes="ccccc" /></g><g
+   id="g705"
+   transform="translate(168.36,166.413)"
+   style="font-size:12;"><rect
+   style="font-size:12;fill:#ead4bc;fill-rule:evenodd;stroke:#b39166;stroke-width:12.5;stroke-dashoffset:5;fill-opacity:1;stroke-dasharray:none;"
+   id="rect706"
+   width="118.977303"
+   height="81.2732315"
+   x="290.74028"
+   y="182.763062" /><path
+   style="fill:#d4b993;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.4987 176.5118 L 415.9331 176.5096 L 403.4166 189.0328 L 296.9416 188.9893 L 284.4987 176.5118 z "
+   id="path707"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#b39a7d;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.5556 176.58 L 296.9299 188.9543 L 296.8747 257.6765 L 284.5555 270.106 L 284.5556 176.58 z "
+   id="path708"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#887058;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 415.9927 176.7363 L 403.6184 189.1105 L 403.6736 257.8327 L 415.9928 270.2622 L 415.9927 176.7363 z "
+   id="path709"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#695144;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 416.0892 270.2808 L 284.6549 270.283 L 297.1714 257.7598 L 403.6463 257.8033 L 416.0892 270.2808 z "
+   id="path710"
+   sodipodi:nodetypes="ccccc" /></g><g
+   id="g699"
+   transform="translate(167.4225,20.78735)"
+   style="font-size:12;"><rect
+   style="font-size:12;fill:#ead4bc;fill-rule:evenodd;stroke:#b39166;stroke-width:12.5;stroke-dashoffset:5;fill-opacity:1;stroke-dasharray:none;"
+   id="rect700"
+   width="118.977303"
+   height="81.2732315"
+   x="290.74028"
+   y="182.763062" /><path
+   style="fill:#d4b993;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.4987 176.5118 L 415.9331 176.5096 L 403.4166 189.0328 L 296.9416 188.9893 L 284.4987 176.5118 z "
+   id="path701"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#b39a7d;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.5556 176.58 L 296.9299 188.9543 L 296.8747 257.6765 L 284.5555 270.106 L 284.5556 176.58 z "
+   id="path702"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#887058;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 415.9927 176.7363 L 403.6184 189.1105 L 403.6736 257.8327 L 415.9928 270.2622 L 415.9927 176.7363 z "
+   id="path703"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#695144;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 416.0892 270.2808 L 284.6549 270.283 L 297.1714 257.7598 L 403.6463 257.8033 L 416.0892 270.2808 z "
+   id="path704"
+   sodipodi:nodetypes="ccccc" /></g><g
+   id="g693"
+   transform="translate(169.4538,-114.2133)"
+   style="font-size:12;"><rect
+   style="font-size:12;fill:#ead4bc;fill-rule:evenodd;stroke:#b39166;stroke-width:12.5;stroke-dashoffset:5;fill-opacity:1;stroke-dasharray:none;"
+   id="rect694"
+   width="118.977303"
+   height="81.2732315"
+   x="290.74028"
+   y="182.763062" /><path
+   style="fill:#d4b993;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.4987 176.5118 L 415.9331 176.5096 L 403.4166 189.0328 L 296.9416 188.9893 L 284.4987 176.5118 z "
+   id="path695"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#b39a7d;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.5556 176.58 L 296.9299 188.9543 L 296.8747 257.6765 L 284.5555 270.106 L 284.5556 176.58 z "
+   id="path696"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#887058;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 415.9927 176.7363 L 403.6184 189.1105 L 403.6736 257.8327 L 415.9928 270.2622 L 415.9927 176.7363 z "
+   id="path697"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#695144;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 416.0892 270.2808 L 284.6549 270.283 L 297.1714 257.7598 L 403.6463 257.8033 L 416.0892 270.2808 z "
+   id="path698"
+   sodipodi:nodetypes="ccccc" /></g><g
+   id="g675"
+   transform="translate(-45.39099,-32.96295)"
+   style="font-size:12;"><rect
+   style="font-size:12;fill:#ead4bc;fill-rule:evenodd;stroke:#b39166;stroke-width:12.5;stroke-dashoffset:5;fill-opacity:1;stroke-dasharray:none;"
+   id="rect607"
+   width="118.977303"
+   height="81.2732315"
+   x="290.74028"
+   y="182.763062" /><path
+   style="fill:#d4b993;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.4987 176.5118 L 415.9331 176.5096 L 403.4166 189.0328 L 296.9416 188.9893 L 284.4987 176.5118 z "
+   id="path660"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#b39a7d;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.5556 176.58 L 296.9299 188.9543 L 296.8747 257.6765 L 284.5555 270.106 L 284.5556 176.58 z "
+   id="path661"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#887058;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 415.9927 176.7363 L 403.6184 189.1105 L 403.6736 257.8327 L 415.9928 270.2622 L 415.9927 176.7363 z "
+   id="path662"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#695144;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 416.0892 270.2808 L 284.6549 270.283 L 297.1714 257.7598 L 403.6463 257.8033 L 416.0892 270.2808 z "
+   id="path663"
+   sodipodi:nodetypes="ccccc" /></g><g
+   id="g687"
+   transform="translate(-45.72247,234.5384)"
+   style="font-size:12;"><rect
+   style="font-size:12;fill:#ead4bc;fill-rule:evenodd;stroke:#b39166;stroke-width:12.5;stroke-dashoffset:5;fill-opacity:1;stroke-dasharray:none;"
+   id="rect688"
+   width="118.977303"
+   height="81.2732315"
+   x="290.74028"
+   y="182.763062" /><path
+   style="fill:#d4b993;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.4987 176.5118 L 415.9331 176.5096 L 403.4166 189.0328 L 296.9416 188.9893 L 284.4987 176.5118 z "
+   id="path689"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#b39a7d;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.5556 176.58 L 296.9299 188.9543 L 296.8747 257.6765 L 284.5555 270.106 L 284.5556 176.58 z "
+   id="path690"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#887058;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 415.9927 176.7363 L 403.6184 189.1105 L 403.6736 257.8327 L 415.9928 270.2622 L 415.9927 176.7363 z "
+   id="path691"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#695144;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 416.0892 270.2808 L 284.6549 270.283 L 297.1714 257.7598 L 403.6463 257.8033 L 416.0892 270.2808 z "
+   id="path692"
+   sodipodi:nodetypes="ccccc" /></g><g
+   id="g681"
+   transform="translate(-259.767,101.4127)"
+   style="font-size:12;"><rect
+   style="font-size:12;fill:#ead4bc;fill-rule:evenodd;stroke:#b39166;stroke-width:12.5;stroke-dashoffset:5;fill-opacity:1;stroke-dasharray:none;"
+   id="rect682"
+   width="118.977303"
+   height="81.2732315"
+   x="290.74028"
+   y="182.763062" /><path
+   style="fill:#d4b993;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.4987 176.5118 L 415.9331 176.5096 L 403.4166 189.0328 L 296.9416 188.9893 L 284.4987 176.5118 z "
+   id="path683"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#b39a7d;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 284.5556 176.58 L 296.9299 188.9543 L 296.8747 257.6765 L 284.5555 270.106 L 284.5556 176.58 z "
+   id="path684"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#887058;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 415.9927 176.7363 L 403.6184 189.1105 L 403.6736 257.8327 L 415.9928 270.2622 L 415.9927 176.7363 z "
+   id="path685"
+   sodipodi:nodetypes="ccccc" /><path
+   style="fill:#695144;fill-rule:evenodd;stroke:none;stroke-opacity:1;stroke-width:0;stroke-linejoin:miter;stroke-linecap:square;stroke-dasharray:none;fill-opacity:1;"
+   d="M 416.0892 270.2808 L 284.6549 270.283 L 297.1714 257.7598 L 403.6463 257.8033 L 416.0892 270.2808 z "
+   id="path686"
+   sodipodi:nodetypes="ccccc" /></g></svg>
--- a/gramps2/src/data/gramps.xml
+++ b/gramps2/src/data/gramps.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-gramps">
+    <comment xml:lang="en">GRAMPS database</comment>
+    <glob pattern="*.grdb"/>
+  </mime-type>
+  <mime-type type="application/x-gedcom">
+    <comment xml:lang="en">GEDCOM</comment>
+    <glob pattern="*.ged"/>
+  </mime-type>
+</mime-info>
--- a/gramps2/src/docgen/Makefile.am
+++ b/gramps2/src/docgen/Makefile.am
@@ -2,7 +2,9 @@
 # Use GNU make's ':=' syntax for nice wildcard use.
 # If not using GNU make, then list all .py files individually

-pkgpython_PYTHON = \
+docgendir=$(DESTDIR)$(prefix)/share/gramps/docgen
+
+docgen_PYTHON = \
 	AbiWord2Doc.py\
 	AsciiDoc.py\
 	HtmlDoc.py\
@@ -16,9 +18,6 @@ pkgpython_PYTHON = \
 	SvgDrawDoc.py\
 	LPRDoc.py

-pkgpyexecdir = @pkgpyexecdir@/docgen
-pkgpythondir = @pkgpythondir@/docgen
-
 GRAMPS_PY_MODPATH = "../"

 pycheck: 
--- a/gramps2/src/docgen/Makefile.in
+++ b/gramps2/src/docgen/Makefile.in
@@ -38,7 +38,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = src/docgen
-DIST_COMMON = $(pkgpython_PYTHON) $(srcdir)/Makefile.am \
+DIST_COMMON = $(docgen_PYTHON) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -48,8 +48,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__installdirs = "$(DESTDIR)$(pkgpythondir)"
-pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
+am__installdirs = "$(DESTDIR)$(docgendir)"
+docgenPYTHON_INSTALL = $(INSTALL_DATA)
 py_compile = $(top_srcdir)/py-compile
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -119,8 +119,8 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-pkgpyexecdir = @pkgpyexecdir@/docgen
-pkgpythondir = @pkgpythondir@/docgen
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 pyexecdir = @pyexecdir@
@@ -129,7 +129,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-pkgpython_PYTHON = \
+docgendir = $(DESTDIR)$(prefix)/share/gramps/docgen
+docgen_PYTHON = \
 	AbiWord2Doc.py\
 	AsciiDoc.py\
 	HtmlDoc.py\
@@ -177,28 +178,28 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
-install-pkgpythonPYTHON: $(pkgpython_PYTHON)
+install-docgenPYTHON: $(docgen_PYTHON)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgpythondir)" || $(mkdir_p) "$(DESTDIR)$(pkgpythondir)"
-	@list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
+	test -z "$(docgendir)" || $(mkdir_p) "$(DESTDIR)$(docgendir)"
+	@list='$(docgen_PYTHON)'; dlist=''; for p in $$list; do\
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
 	    d=`echo $$p | sed -e 's,^.*/,,'`; \
 	    dlist="$$dlist $$d"; \
-	    echo " $(pkgpythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgpythondir)/$$d'"; \
-	    $(pkgpythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgpythondir)/$$d"; \
+	    echo " $(docgenPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(docgendir)/$$d'"; \
+	    $(docgenPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(docgendir)/$$d"; \
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pkgpythondir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(docgendir)" $$dlist

-uninstall-pkgpythonPYTHON:
+uninstall-docgenPYTHON:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
+	@list='$(docgen_PYTHON)'; dlist=''; for p in $$list; do\
 	  d=`echo $$p | sed -e 's,^.*/,,'`; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$$d"; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$${d}c"; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$${d}o"; \
+	  rm -f "$(DESTDIR)$(docgendir)/$$d"; \
+	  rm -f "$(DESTDIR)$(docgendir)/$${d}c"; \
+	  rm -f "$(DESTDIR)$(docgendir)/$${d}o"; \
 	done
 tags: TAGS
 TAGS:
@@ -238,7 +239,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile
 installdirs:
-	for dir in "$(DESTDIR)$(pkgpythondir)"; do \
+	for dir in "$(DESTDIR)$(docgendir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -283,7 +284,7 @@ info: info-am

 info-am:

-install-data-am: install-pkgpythonPYTHON
+install-data-am: install-docgenPYTHON

 install-exec-am:

@@ -309,17 +310,17 @@ ps: ps-am

 ps-am:

-uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON
+uninstall-am: uninstall-docgenPYTHON uninstall-info-am

 .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-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pkgpythonPYTHON install-strip installcheck \
+	install install-am install-data install-data-am \
+	install-docgenPYTHON install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-pkgpythonPYTHON
+	pdf-am ps ps-am uninstall uninstall-am uninstall-docgenPYTHON \
+	uninstall-info-am


 pycheck: 
--- a/gramps2/src/plugins/Makefile.am
+++ b/gramps2/src/plugins/Makefile.am
@@ -2,7 +2,10 @@
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
-pkgpython_PYTHON = \
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins
+
+pkgdata_PYTHON = \
 	AncestorChart.py\
 	AncestorChart2.py\
 	AncestorReport.py\
@@ -73,8 +76,6 @@ GLADEFILES = \
 	book.glade\
 	writeftree.glade

-pkgdatadir = $(datadir)/@PACKAGE@/plugins
-
 dist_pkgdata_DATA = $(GLADEFILES)

 GRAMPS_PY_MODPATH = "../:../docgen"
--- a/gramps2/src/plugins/Makefile.in
+++ b/gramps2/src/plugins/Makefile.in
@@ -14,6 +14,11 @@

@SET_MAKE@

+# This is the src/plugins level Makefile for Gramps
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -34,7 +39,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = src/plugins
-DIST_COMMON = $(dist_pkgdata_DATA) $(pkgpython_PYTHON) \
+DIST_COMMON = $(dist_pkgdata_DATA) $(pkgdata_PYTHON) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -44,8 +49,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__installdirs = "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(pkgdatadir)"
-pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
+am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"
+pkgdataPYTHON_INSTALL = $(INSTALL_DATA)
 py_compile = $(top_srcdir)/py-compile
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
@@ -128,12 +133,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
-# This is the src/plugins level Makefile for Gramps
-# We could use GNU make's ':=' syntax for nice wildcard use,
-# but that is not necessarily portable.
-# If not using GNU make, then list all .py files individually
-pkgpython_PYTHON = \
+pkgdata_PYTHON = \
 	AncestorChart.py\
 	AncestorChart2.py\
 	AncestorReport.py\
@@ -236,28 +236,28 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
-install-pkgpythonPYTHON: $(pkgpython_PYTHON)
+install-pkgdataPYTHON: $(pkgdata_PYTHON)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgpythondir)" || $(mkdir_p) "$(DESTDIR)$(pkgpythondir)"
-	@list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
+	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+	@list='$(pkgdata_PYTHON)'; dlist=''; for p in $$list; do\
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
 	    d=`echo $$p | sed -e 's,^.*/,,'`; \
 	    dlist="$$dlist $$d"; \
-	    echo " $(pkgpythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgpythondir)/$$d'"; \
-	    $(pkgpythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgpythondir)/$$d"; \
+	    echo " $(pkgdataPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgdatadir)/$$d'"; \
+	    $(pkgdataPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgdatadir)/$$d"; \
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pkgpythondir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pkgdatadir)" $$dlist

-uninstall-pkgpythonPYTHON:
+uninstall-pkgdataPYTHON:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
+	@list='$(pkgdata_PYTHON)'; dlist=''; for p in $$list; do\
 	  d=`echo $$p | sed -e 's,^.*/,,'`; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$$d"; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$${d}c"; \
-	  rm -f "$(DESTDIR)$(pkgpythondir)/$${d}o"; \
+	  rm -f "$(DESTDIR)$(pkgdatadir)/$$d"; \
+	  rm -f "$(DESTDIR)$(pkgdatadir)/$${d}c"; \
+	  rm -f "$(DESTDIR)$(pkgdatadir)/$${d}o"; \
 	done
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	@$(NORMAL_INSTALL)
@@ -314,7 +314,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(pkgdatadir)"; do \
+	for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -359,7 +359,7 @@ info: info-am

 info-am:

-install-data-am: install-dist_pkgdataDATA install-pkgpythonPYTHON
+install-data-am: install-dist_pkgdataDATA install-pkgdataPYTHON

 install-exec-am:

@@ -386,19 +386,18 @@ ps: ps-am
 ps-am:

 uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am \
-	uninstall-pkgpythonPYTHON
+	uninstall-pkgdataPYTHON

 .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-dist_pkgdataDATA install-exec install-exec-am \
-	install-info install-info-am install-man \
-	install-pkgpythonPYTHON install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am \
+	install-info install-info-am install-man install-pkgdataPYTHON \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
 	uninstall-dist_pkgdataDATA uninstall-info-am \
-	uninstall-pkgpythonPYTHON
+	uninstall-pkgdataPYTHON


 pycheck: