5554: back-port to gramps32 to debug 6757

Back-port the following commit: commit d43545a98a00b01228786776f74121d58bb73966 Author: Josip Pisoj <josip@pisoj.com> Date: Fri Feb 10 20:25:15 2012 +0000 bug #5554: Automake problem git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/trunk@18851 4ae1f11a-8b86-4847-b8af-ab372f36d1fd svn: r23210
2013-09-27 21:40:49 +00:00 · 2013-09-27 21:40:49 +00:00 · 562fdbb06a
commit 562fdbb06a
parent f83f4c8451
52 changed files with 575 additions and 622 deletions
--- a/src/DateHandler/Makefile.am
+++ b/src/DateHandler/Makefile.am
@ -3,9 +3,7 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/DateHandler
-
-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
        _Date_bg.py\
 	_Date_ca.py\
 	_Date_cs.py\
@ -32,7 +30,7 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/DateHandler
-pkgpythondir = @pkgpythondir@/DateHandler
+pkgpythondir = $(datadir)/@PACKAGE@/DateHandler

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -50,4 +48,4 @@ docs:

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Filters/Makefile.am
+++ b/src/Filters/Makefile.am
@ -2,9 +2,9 @@

 SUBDIRS = Rules SideBar

-pkgdatadir = $(datadir)/@PACKAGE@/Filters
+pkgpythondir = $(datadir)/@PACKAGE@/Filters

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_FilterComboBox.py \
 	_FilterList.py \
 	_FilterMenu.py \
@ -17,7 +17,6 @@ pkgdata_PYTHON = \
 	_SearchFilter.py

 pkgpyexecdir = @pkgpyexecdir@/Filters
-pkgpythondir = @pkgpythondir@/Filters

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -26,4 +25,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Filters/Rules/Event/Makefile.am
+++ b/src/Filters/Rules/Event/Makefile.am
@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/Event level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Event
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Event

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSince.py\
 	_MatchesFilter.py\
 	_EventPrivate.py\
@ -24,7 +24,7 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Event
-pkgpythondir = @pkgpythondir@/Filters/Rules/Event
+

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -33,4 +33,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Filters/Rules/Family/Makefile.am
+++ b/src/Filters/Rules/Family/Makefile.am
@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/Family level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Family
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Family

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllFamilies.py\
 	_ChangedSince.py\
 	_FamilyPrivate.py\
@ -38,7 +38,6 @@ pkgdata_PYTHON = \


 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Family
-pkgpythondir = @pkgpythondir@/Filters/Rules/Family

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -47,4 +46,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Filters/Rules/Makefile.am
+++ b/src/Filters/Rules/Makefile.am
@ -2,9 +2,9 @@

 SUBDIRS = Person Family Event Place Source MediaObject Repository Note

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSinceBase.py\
 	_Everything.py\
 	_HasEventBase.py\
@ -29,7 +29,6 @@ pkgdata_PYTHON = \
 	_HasMarkerBase.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules
-pkgpythondir = @pkgpythondir@/Filters/Rules

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -38,4 +37,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Filters/Rules/MediaObject/Makefile.am
+++ b/src/Filters/Rules/MediaObject/Makefile.am
@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/MediaObject level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/MediaObject
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/MediaObject

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllMedia.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@ -17,7 +17,7 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/MediaObject
-pkgpythondir = @pkgpythondir@/Filters/Rules/MediaObject
+

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -26,4 +26,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Filters/Rules/Note/Makefile.am
+++ b/src/Filters/Rules/Note/Makefile.am
@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/Note level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Note
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Note

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllNotes.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@ -17,7 +17,6 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Note
-pkgpythondir = @pkgpythondir@/Filters/Rules/Note

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -26,4 +25,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Filters/Rules/Person/Makefile.am
+++ b/src/Filters/Rules/Person/Makefile.am
@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/Person level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Person
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Person

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSince.py\
 	_Disconnected.py \
    _DeepRelationshipPathBetween.py \
@ -74,7 +74,6 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Person
-pkgpythondir = @pkgpythondir@/Filters/Rules/Person

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -83,4 +82,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Filters/Rules/Place/Makefile.am
+++ b/src/Filters/Rules/Place/Makefile.am
@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/Place level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Place
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Place

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllPlaces.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@ -21,7 +21,6 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Place
-pkgpythondir = @pkgpythondir@/Filters/Rules/Place

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -30,4 +29,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Filters/Rules/Repository/Makefile.am
+++ b/src/Filters/Rules/Repository/Makefile.am
@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/Media level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Repository
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Repository

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllRepos.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@ -16,7 +16,6 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Repository
-pkgpythondir = @pkgpythondir@/Filters/Rules/Repository

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -25,4 +24,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Filters/Rules/Source/Makefile.am
+++ b/src/Filters/Rules/Source/Makefile.am
@ -1,8 +1,8 @@
 # This is the src/Filters/Rules/Source level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Source
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Source

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSince.py\
 	_MatchesFilter.py\
 	_SourcePrivate.py\
@ -19,7 +19,6 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Source
-pkgpythondir = @pkgpythondir@/Filters/Rules/Source

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -28,4 +27,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Filters/SideBar/Makefile.am
+++ b/src/Filters/SideBar/Makefile.am
@ -1,8 +1,8 @@
 # This is the src/Filters/SideBar level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Filters/SideBar
+pkgpythondir = $(datadir)/@PACKAGE@/Filters/SideBar

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_EventSidebarFilter.py \
 	_FamilySidebarFilter.py \
 	__init__.py \
@ -15,7 +15,6 @@ pkgdata_PYTHON = \
 	_NoteSidebarFilter.py

 pkgpyexecdir = @pkgpyexecdir@/Filters/SideBar
-pkgpythondir = @pkgpythondir@/Filters/SideBar

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -24,4 +23,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/GrampsLocale/Makefile.am
+++ b/src/GrampsLocale/Makefile.am
@ -3,16 +3,14 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/GrampsLocale
+pkgpythondir = $(datadir)/@PACKAGE@/GrampsLocale

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_GrampsLocale.py\
 	__init__.py
 	

 pkgpyexecdir = @pkgpyexecdir@/GrampsLocale
-pkgpythondir = @pkgpythondir@/GrampsLocale
-

 dist_pkgdata_DATA = 

@ -23,4 +21,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/GrampsLogger/Makefile.am
+++ b/src/GrampsLogger/Makefile.am
@ -3,9 +3,7 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/GrampsLogger
-
-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ErrorReportAssistant.py\
 	_ErrorView.py\
 	_GtkHandler.py\
@ -13,7 +11,7 @@ pkgdata_PYTHON = \
 	_RotateHandler.py

 pkgpyexecdir = @pkgpyexecdir@/GrampsLogger
-pkgpythondir = @pkgpythondir@/GrampsLogger
+pkgpythondir = $(datadir)/@PACKAGE@/GrampsLogger

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -22,4 +20,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Merge/Makefile.am
+++ b/src/Merge/Makefile.am
@ -3,16 +3,15 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/Merge
+pkgpythondir = $(datadir)/@PACKAGE@/Merge

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	_MergePerson.py \
 	_MergePlace.py \
 	_MergeSource.py

 pkgpyexecdir = @pkgpyexecdir@/Merge
-pkgpythondir = @pkgpythondir@/Merge

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -21,4 +20,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/PluginUtils/Makefile.am
+++ b/src/PluginUtils/Makefile.am
@ -3,9 +3,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/PluginUtils
+pkgpythondir = $(datadir)/@PACKAGE@/PluginUtils

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py\
 	_GuiOptions.py\
 	_Options.py\
@ -23,4 +23,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/ReportBase/Makefile.am
+++ b/src/ReportBase/Makefile.am
@ -1,8 +1,8 @@
 # This is the src/Report level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/ReportBase
+pkgpythondir = $(datadir)/@PACKAGE@/ReportBase

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py\
 	_Bibliography.py\
 	_CommandLineReport.py\
@ -32,4 +32,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/Simple/Makefile.am
+++ b/src/Simple/Makefile.am
@ -1,15 +1,14 @@
 # This is the src/Report level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/Simple
+pkgpythondir = $(datadir)/@PACKAGE@/Simple

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_SimpleDoc.py\
 	_SimpleAccess.py\
        _SimpleTable.py\
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/Simple
-pkgpythondir = @pkgpythondir@/Simple

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -18,4 +17,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@ -3,9 +3,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/cli
+pkgpythondir = $(datadir)/@PACKAGE@/cli

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	arghandler.py \
 	argparser.py \
@ -13,7 +13,7 @@ pkgdata_PYTHON = \
 	grampscli.py

 pkgpyexecdir = @pkgpyexecdir@/cli
-pkgpythondir = @pkgpythondir@/cli
+

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -22,7 +22,7 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));

 pylint:
-	PYTHONPATH=$(GRAMPS_PY_MODPATH) pylint $(pkgdata_PYTHON) > pylint.out
+	PYTHONPATH=$(GRAMPS_PY_MODPATH) pylint $(pkgpython_PYTHON) > pylint.out
--- a/src/gen/Makefile.am
+++ b/src/gen/Makefile.am
@ -12,15 +12,14 @@ SUBDIRS = \
 	proxy \
 	utils

-pkgdatadir = $(datadir)/@PACKAGE@/gen
+pkgpythondir = $(datadir)/@PACKAGE@/gen

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	ggettext.py \
 	updatecallback.py

 pkgpyexecdir = @pkgpyexecdir@/gen
-pkgpythondir = @pkgpythondir@/gen


 # Clean up all the byte-compiled files
@ -30,4 +29,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gen/db/Makefile.am
+++ b/src/gen/db/Makefile.am
@ -3,9 +3,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/gen/db
+pkgpythondir = $(datadir)/@PACKAGE@/gen/db

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	backup.py \
 	base.py \
@ -20,7 +20,6 @@ pkgdata_PYTHON = \
 	write.py

 pkgpyexecdir = @pkgpyexecdir@/gen/db
-pkgpythondir = @pkgpythondir@/gen/db


 # Clean up all the byte-compiled files
@ -30,4 +29,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gen/display/Makefile.am
+++ b/src/gen/display/Makefile.am
@ -3,15 +3,13 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/gen/display
+pkgpythondir = $(datadir)/@PACKAGE@/gen/display

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	name.py\
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/gen/display
-pkgpythondir = @pkgpythondir@/gen/display
-

 dist_pkgdata_DATA = 

@ -22,4 +20,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gen/lib/Makefile.am
+++ b/src/gen/lib/Makefile.am
@ -3,9 +3,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/gen/lib
+pkgpythondir = $(datadir)/@PACKAGE@/gen/lib

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	addressbase.py \
 	address.py \
 	attrbase.py \
@ -66,7 +66,6 @@ pkgdata_PYTHON = \
 	witness.py 

 pkgpyexecdir = @pkgpyexecdir@/gen/lib
-pkgpythondir = @pkgpythondir@/gen/lib

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -75,7 +74,7 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));

 pylint:
-	pylint --disable-msg=W0403,C0103 $(pkgdata_PYTHON)
+	pylint --disable-msg=W0403,C0103 $(pkgpython_PYTHON)
--- a/src/gen/mime/Makefile.am
+++ b/src/gen/mime/Makefile.am
@ -3,16 +3,15 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/gen/mime
+pkgpythondir = $(datadir)/@PACKAGE@/gen/mime

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py\
 	_gnomemime.py\
 	_winmime.py\
 	_pythonmime.py

 pkgpyexecdir = @pkgpyexecdir@/gen/mime
-pkgpythondir = @pkgpythondir@/gen/mime

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -21,4 +20,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gen/plug/Makefile.am
+++ b/src/gen/plug/Makefile.am
@ -8,9 +8,9 @@ SUBDIRS = \
 	docgen\
 	menu

-pkgdatadir = $(datadir)/@PACKAGE@/gen/plug
+pkgpythondir = $(datadir)/@PACKAGE@/gen/plug

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	_docgenplugin.py \
 	_export.py \
@ -22,8 +22,6 @@ pkgdata_PYTHON = \
 	utils.py

 pkgpyexecdir = @pkgpyexecdir@/gen/plug
-pkgpythondir = @pkgpythondir@/gen/plug
-

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -32,4 +30,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gen/plug/docbackend/Makefile.am
+++ b/src/gen/plug/docbackend/Makefile.am
@ -3,16 +3,14 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/gen/plug/docbackend
+pkgpythondir = $(datadir)/@PACKAGE@/gen/plug/docbackend

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	cairobackend.py \
 	docbackend.py 

 pkgpyexecdir = @pkgpyexecdir@/gen/plug/docbackend
-pkgpythondir = @pkgpythondir@/gen/plug/docbackend
-

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -21,4 +19,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gen/plug/docgen/Makefile.am
+++ b/src/gen/plug/docgen/Makefile.am
@ -5,7 +5,7 @@

 pkgdatadir = $(datadir)/@PACKAGE@/gen/plug/docgen

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	basedoc.py  \
 	drawdoc.py \
@ -20,7 +20,7 @@ pkgdata_PYTHON = \
 	textdoc.py 

 pkgpyexecdir = @pkgpyexecdir@/gen/plug/docgen
-pkgpythondir = @pkgpythondir@/gen/plug/docgen
+pkgpythondir = $(datadir)/@PACKAGE@/gen/plug/docgen


 # Clean up all the byte-compiled files
@ -30,4 +30,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gen/plug/menu/Makefile.am
+++ b/src/gen/plug/menu/Makefile.am
@ -3,9 +3,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/gen/plug/menu
+pkgpythondir = $(datadir)/@PACKAGE@/gen/plug/menu

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	_boolean.py \
 	_booleanlist.py \
@ -28,8 +28,6 @@ pkgdata_PYTHON = \
 	_text.py 

 pkgpyexecdir = @pkgpyexecdir@/gen/plug/menu
-pkgpythondir = @pkgpythondir@/gen/plug/menu
-

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -38,4 +36,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gen/proxy/Makefile.am
+++ b/src/gen/proxy/Makefile.am
@ -3,9 +3,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/gen/proxy
+pkgpythondir = $(datadir)/@PACKAGE@/gen/proxy

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	filter.py \
 	living.py \
@ -14,8 +14,6 @@ pkgdata_PYTHON = \
 	proxybase.py

 pkgpyexecdir = @pkgpyexecdir@/gen/proxy
-pkgpythondir = @pkgpythondir@/gen/proxy
-

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -24,4 +22,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gen/utils/Makefile.am
+++ b/src/gen/utils/Makefile.am
@ -3,9 +3,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/gen/utils
+pkgpythondir = $(datadir)/@PACKAGE@/gen/utils

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	callback.py \
 	callman.py \
@ -13,8 +13,6 @@ pkgdata_PYTHON = \
 	fallback.py

 pkgpyexecdir = @pkgpyexecdir@/gen/utils
-pkgpythondir = @pkgpythondir@/gen/utils
-

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -23,4 +21,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@ -9,9 +9,9 @@ SUBDIRS = \
 	views \
 	widgets

-pkgdatadir = $(datadir)/@PACKAGE@/gui
+pkgpythondir = $(datadir)/@PACKAGE@/gui

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	columnorder.py \
 	configure.py \
@ -25,8 +25,6 @@ pkgdata_PYTHON = \
 	viewmanager.py

 pkgpyexecdir = @pkgpyexecdir@/gui
-pkgpythondir = @pkgpythondir@/gui
-

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -35,4 +33,4 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gui/editors/Makefile.am
+++ b/src/gui/editors/Makefile.am
@ -6,9 +6,9 @@
 SUBDIRS = \
 	displaytabs

-pkgdatadir = $(datadir)/@PACKAGE@/gui/editors
+pkgpythondir = $(datadir)/@PACKAGE@/gui/editors

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	addmedia.py\
 	__init__.py\
 	editaddress.py \
@ -37,7 +37,6 @@ pkgdata_PYTHON = \
 	objectentries.py

 pkgpyexecdir = @pkgpyexecdir@/gui/editors
-pkgpythondir = @pkgpythondir@/gui/editors

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -46,4 +45,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gui/editors/displaytabs/Makefile.am
+++ b/src/gui/editors/displaytabs/Makefile.am
@ -1,8 +1,8 @@
 # This is the src/gui/editors/displaytabs level Makefile for Gramps

-pkgdatadir = $(datadir)/@PACKAGE@/gui/editors/displaytabs
+pkgpythondir = $(datadir)/@PACKAGE@/gui/editors/displaytabs

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	addrembedlist.py \
 	addressmodel.py \
 	attrembedlist.py \
@ -47,7 +47,6 @@ pkgdata_PYTHON = \
 	__init__.py

 pkgpyexecdir = @pkgpyexecdir@/gui/editors/displaytabs
-pkgpythondir = @pkgpythondir@/gui/editors/displaytabs

 # clean up all the byte-compiled files
 MOSTLYcLEANFILES = *pyc *pyo
@ -56,4 +55,4 @@ GRAMPS_PY_MODPATH = "../../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gui/selectors/Makefile.am
+++ b/src/gui/selectors/Makefile.am
@ -3,9 +3,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/gui/selectors
+pkgpythondir = $(datadir)/@PACKAGE@/gui/selectors

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	baseselector.py \
 	selectevent.py \
@ -20,7 +20,6 @@ pkgdata_PYTHON = \
 	selectorfactory.py

 pkgpyexecdir = @pkgpyexecdir@/gui/selectors
-pkgpythondir = @pkgpythondir@/gui/selectors

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -29,4 +28,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gui/views/Makefile.am
+++ b/src/gui/views/Makefile.am
@ -6,16 +6,15 @@
 SUBDIRS = \
 	treemodels

-pkgdatadir = $(datadir)/@PACKAGE@/gui/views
+pkgpythondir = $(datadir)/@PACKAGE@/gui/views

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	listview.py \
 	navigationview.py \
 	pageview.py

 pkgpyexecdir = @pkgpyexecdir@/gui/views
-pkgpythondir = @pkgpythondir@/gui/views

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -24,7 +23,7 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));

 pylint:
-	PYTHONPATH=$(GRAMPS_PY_MODPATH) pylint $(pkgdata_PYTHON) > pylint.out
+	PYTHONPATH=$(GRAMPS_PY_MODPATH) pylint $(pkgpython_PYTHON) > pylint.out
--- a/src/gui/views/treemodels/Makefile.am
+++ b/src/gui/views/treemodels/Makefile.am
@ -3,9 +3,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/gui/views/treemodels
+pkgpythondir = $(datadir)/@PACKAGE@/gui/views/treemodels

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	eventmodel.py \
 	familymodel.py \
@ -19,7 +19,6 @@ pkgdata_PYTHON = \
 	treebasemodel.py

 pkgpyexecdir = @pkgpyexecdir@/gui/views/treemodels
-pkgpythondir = @pkgpythondir@/gui/views/treemodels

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -28,7 +27,7 @@ GRAMPS_PY_MODPATH = "../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));

 pylint:
-	PYTHONPATH=$(GRAMPS_PY_MODPATH) pylint $(pkgdata_PYTHON) > pylint.out
+	PYTHONPATH=$(GRAMPS_PY_MODPATH) pylint $(pkgpython_PYTHON) > pylint.out
--- a/src/gui/widgets/Makefile.am
+++ b/src/gui/widgets/Makefile.am
@ -3,9 +3,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/gui/widgets
+pkgpythondir = $(datadir)/@PACKAGE@/gui/widgets

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	buttons.py \
 	expandcollapsearrow.py \
@ -27,7 +27,6 @@ pkgdata_PYTHON = \
 	valuetoolitem.py

 pkgpyexecdir = @pkgpyexecdir@/gui/widgets
-pkgpythondir = @pkgpythondir@/gui/widgets

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -36,5 +35,5 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));

--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@ -21,14 +21,14 @@ SUBDIRS = \

 pkgdatadir = $(datadir)/@PACKAGE@/plugins

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
    bookreport.gpr.py\
 	BookReport.py\
 	records.gpr.py\
 	Records.py

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

 GLADEFILES = \
 	bookreport.glade
@ -46,4 +46,4 @@ GRAMPS_PY_MODPATH = "../:../docgen"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/docgen/Makefile.am
+++ b/src/plugins/docgen/Makefile.am
@ -1,39 +1,39 @@
-# This is the src/plugins/docgen 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/docgen
-
-pkgdata_PYTHON = \
-	AsciiDoc.py \
-	docgen.gpr.py\
-	GtkPrint.py \
-	HtmlDoc.py \
-	LaTeXDoc.py \
-	ODFDoc.py \
-	PdfDoc.py \
-	PSDrawDoc.py \
-	RTFDoc.py \
-	SvgDrawDoc.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/docgen
-pkgpythondir = @pkgpythondir@/plugins/docgen
-
-GLADEFILES = \
-	gtkprint.glade 
-
-GRAPHICS = 
-
-DATAFILES = 
-
-dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/docgen 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
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/docgen
+
+pkgpython_PYTHON = \
+	AsciiDoc.py \
+	docgen.gpr.py\
+	GtkPrint.py \
+	HtmlDoc.py \
+	LaTeXDoc.py \
+	ODFDoc.py \
+	PdfDoc.py \
+	PSDrawDoc.py \
+	RTFDoc.py \
+	SvgDrawDoc.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/docgen
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/docgen
+
+GLADEFILES = \
+	gtkprint.glade 
+
+GRAPHICS = 
+
+DATAFILES = 
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/drawreport/Makefile.am
+++ b/src/plugins/drawreport/Makefile.am
@ -1,27 +1,26 @@
-# This is the src/plugins/drawreport 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/drawreport
-
-pkgdata_PYTHON = \
-	AncestorTree.py \
-	Calendar.py\
-	DescendTree.py \
-	drawplugins.gpr.py\
-	FanChart.py \
-	StatisticsChart.py \
-	TimeLine.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/drawreport
-pkgpythondir = @pkgpythondir@/plugins/drawreport
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/drawreport 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
+
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/drawreport
+
+pkgpython_PYTHON = \
+	AncestorTree.py \
+	Calendar.py\
+	DescendTree.py \
+	drawplugins.gpr.py\
+	FanChart.py \
+	StatisticsChart.py \
+	TimeLine.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/drawreport
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/export/Makefile.am
+++ b/src/plugins/export/Makefile.am
@ -1,43 +1,43 @@
-# This is the src/plugins/export 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/export
-
-pkgdata_PYTHON = \
-	export.gpr.py \
-	ExportCsv.py \
-	ExportFtree.py \
-	ExportGedcom.py \
-	ExportGeneWeb.py \
-	ExportPkg.py \
-	ExportVCalendar.py \
-	ExportVCard.py \
-	ExportXml.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/export
-pkgpythondir = @pkgpythondir@/plugins/export
-
-GLADEFILES = \
-	exportcsv.glade \
-	exportftree.glade \
-	exportgeneweb.glade \
-	exportvcalendar.glade \
-	exportvcard.glade
-
-
-GRAPHICS = 
-
-DATAFILES = 
-
-dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/export 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
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/export
+
+pkgpython_PYTHON = \
+	export.gpr.py \
+	ExportCsv.py \
+	ExportFtree.py \
+	ExportGedcom.py \
+	ExportGeneWeb.py \
+	ExportPkg.py \
+	ExportVCalendar.py \
+	ExportVCard.py \
+	ExportXml.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/export
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/export
+
+GLADEFILES = \
+	exportcsv.glade \
+	exportftree.glade \
+	exportgeneweb.glade \
+	exportvcalendar.glade \
+	exportvcard.glade
+
+
+GRAPHICS = 
+
+DATAFILES = 
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));
--- a/src/plugins/gramplet/Makefile.am
+++ b/src/plugins/gramplet/Makefile.am
@ -1,40 +1,39 @@
-# This is the src/plugins/drawreport 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/gramplet
-
-pkgdata_PYTHON = \
-	AgeOnDateGramplet.py \
-	AgeStats.py \
-	AttributesGramplet.py \
-	CalendarGramplet.py \
-	DescendGramplet.py \
-	FanChartGramplet.py \
-	FaqGramplet.py \
-	GivenNameGramplet.py \
-	gramplet.gpr.py \
-	PedigreeGramplet.py \
-	PluginManagerGramplet.py\
-	QuickViewGramplet.py \
-	RelativeGramplet.py \
-	SessionLogGramplet.py \
-	StatsGramplet.py \
-	SurnameCloudGramplet.py \
-	ToDoGramplet.py \
-	TopSurnamesGramplet.py \
-	WelcomeGramplet.py \
-	WhatsNext.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/gramplet
-pkgpythondir = @pkgpythondir@/plugins/gramplet
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/drawreport 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
+
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/gramplet
+
+pkgpython_PYTHON = \
+	AgeOnDateGramplet.py \
+	AgeStats.py \
+	AttributesGramplet.py \
+	CalendarGramplet.py \
+	DescendGramplet.py \
+	FanChartGramplet.py \
+	FaqGramplet.py \
+	GivenNameGramplet.py \
+	gramplet.gpr.py \
+	PedigreeGramplet.py \
+	PluginManagerGramplet.py\
+	QuickViewGramplet.py \
+	RelativeGramplet.py \
+	SessionLogGramplet.py \
+	StatsGramplet.py \
+	SurnameCloudGramplet.py \
+	ToDoGramplet.py \
+	TopSurnamesGramplet.py \
+	WelcomeGramplet.py \
+	WhatsNext.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/gramplet
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/graph/Makefile.am
+++ b/src/plugins/graph/Makefile.am
@ -1,24 +1,23 @@
-# This is the src/plugins/graph 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/graph
-
-pkgdata_PYTHON = \
-	graphplugins.gpr.py\
-	GVFamilyLines.py \
-	GVHourGlass.py \
-	GVRelGraph.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/graph
-pkgpythondir = @pkgpythondir@/plugins/graph
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/graph 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
+
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/graph
+
+pkgpython_PYTHON = \
+	graphplugins.gpr.py\
+	GVFamilyLines.py \
+	GVHourGlass.py \
+	GVRelGraph.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/graph
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/import/Makefile.am
+++ b/src/plugins/import/Makefile.am
@ -1,38 +1,38 @@
-# This is the src/plugins/import 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/import
-
-pkgdata_PYTHON = \
-	import.gpr.py \
-	ImportCsv.py \
-	ImportGedcom.py \
-	ImportGeneWeb.py \
-	ImportGpkg.py \
-	ImportGrdb.py \
-	ImportProGen.py \
-	ImportVCard.py \
-	ImportXml.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/import
-pkgpythondir = @pkgpythondir@/plugins/import
-
-GLADEFILES = \
-	importgedcom.glade
-
-GRAPHICS = 
-
-DATAFILES = 
-
-dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/import 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
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/import
+
+pkgpython_PYTHON = \
+	import.gpr.py \
+	ImportCsv.py \
+	ImportGedcom.py \
+	ImportGeneWeb.py \
+	ImportGpkg.py \
+	ImportGrdb.py \
+	ImportProGen.py \
+	ImportVCard.py \
+	ImportXml.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/import
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/import
+
+GLADEFILES = \
+	importgedcom.glade
+
+GRAPHICS = 
+
+DATAFILES = 
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/lib/Makefile.am
+++ b/src/plugins/lib/Makefile.am
@ -5,7 +5,7 @@

 pkgdatadir = $(datadir)/@PACKAGE@/plugins/lib

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	libcairodoc.py\
 	libformatting.py\
 	libgedcom.py\
@ -25,7 +25,7 @@ pkgdata_PYTHON = \
 	libtranslate.py

 pkgpyexecdir = @pkgpyexecdir@/plugins/lib
-pkgpythondir = @pkgpythondir@/plugins/lib
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/lib

 GLADEFILES = 

@ -43,4 +43,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/mapservices/Makefile.am
+++ b/src/plugins/mapservices/Makefile.am
@ -1,32 +1,32 @@
-# This is the src/plugins/mapservices 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/mapservices
-
-pkgdata_PYTHON = \
-	googlemap.py\
-	mapservice.gpr.py\
-	openstreetmap.py\
-	eniroswedenmap.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/mapservices
-pkgpythondir = @pkgpythondir@/plugins/mapservices
-
-GLADEFILES = 
-
-GRAPHICS = 
-
-DATAFILES = 
-
-dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/mapservices 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
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/mapservices
+
+pkgpython_PYTHON = \
+	googlemap.py\
+	mapservice.gpr.py\
+	openstreetmap.py\
+	eniroswedenmap.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/mapservices
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/mapservices
+
+GLADEFILES = 
+
+GRAPHICS = 
+
+DATAFILES = 
+
+dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/quickview/Makefile.am
+++ b/src/plugins/quickview/Makefile.am
@ -1,32 +1,32 @@
-# This is the src/plugins/quickview 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/quickview
-
-pkgdata_PYTHON = \
-	AgeOnDate.py \
-	all_events.py \
-	all_relations.py \
-	AttributeMatch.py \
-	FilterByName.py \
-	lineage.py \
-	OnThisDay.py \
-	quickview.gpr.py \
-	References.py \
-	Reporef.py \
-	SameSurnames.py\
-	siblings.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/quickview
-pkgpythondir = @pkgpythondir@/plugins/quickview
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/quickview 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
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/quickview
+
+pkgpython_PYTHON = \
+	AgeOnDate.py \
+	all_events.py \
+	all_relations.py \
+	AttributeMatch.py \
+	FilterByName.py \
+	lineage.py \
+	OnThisDay.py \
+	quickview.gpr.py \
+	References.py \
+	Reporef.py \
+	SameSurnames.py\
+	siblings.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/quickview
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/quickview
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/rel/Makefile.am
+++ b/src/plugins/rel/Makefile.am
@ -1,38 +1,38 @@
-# This is the src/plugins/rel 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/rel
-
-pkgdata_PYTHON = \
-	relplugins.gpr.py\
-	rel_cs.py\
-	rel_da.py\
-	rel_de.py\
-	rel_es.py\
-	rel_fi.py\
-	rel_fr.py\
+# This is the src/plugins/rel 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
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/rel
+
+pkgpython_PYTHON = \
+	relplugins.gpr.py\
+	rel_cs.py\
+	rel_da.py\
+	rel_de.py\
+	rel_es.py\
+	rel_fi.py\
+	rel_fr.py\
 	rel_hu.py\
-        rel_hr.py\
-	rel_it.py\
-	rel_nl.py\
-	rel_no.py\
-	rel_pl.py\
-	rel_pt.py\
-	rel_ru.py\
+        rel_hr.py\
+	rel_it.py\
+	rel_nl.py\
+	rel_no.py\
+	rel_pl.py\
+	rel_pt.py\
+	rel_ru.py\
 	rel_sk.py\
-	rel_sl.py\
-	rel_sv.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/rel
-pkgpythondir = @pkgpythondir@/plugins/rel
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	rel_sl.py\
+	rel_sv.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/rel
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/rel
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/textreport/Makefile.am
+++ b/src/plugins/textreport/Makefile.am
@ -1,36 +1,35 @@
-# This is the src/plugins/textreport 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/textreport
-
-pkgdata_PYTHON = \
-	AncestorReport.py\
-	BirthdayReport.py\
-	CustomBookText.py\
-	DescendReport.py\
-	DetAncestralReport.py\
-	DetDescendantReport.py\
-	EndOfLineReport.py\
-	FamilyGroup.py\
-	IndivComplete.py\
-	KinshipReport.py\
-	MarkerReport.py\
-	NumberOfAncestorsReport.py\
-	PlaceReport.py\
-	SimpleBookTitle.py\
-	Summary.py\
-	textplugins.gpr.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/textreport
-pkgpythondir = @pkgpythondir@/plugins/textreport
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/textreport 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
+
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/textreport
+
+pkgpython_PYTHON = \
+	AncestorReport.py\
+	BirthdayReport.py\
+	CustomBookText.py\
+	DescendReport.py\
+	DetAncestralReport.py\
+	DetDescendantReport.py\
+	EndOfLineReport.py\
+	FamilyGroup.py\
+	IndivComplete.py\
+	KinshipReport.py\
+	MarkerReport.py\
+	NumberOfAncestorsReport.py\
+	PlaceReport.py\
+	SimpleBookTitle.py\
+	Summary.py\
+	textplugins.gpr.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/textreport
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/tool/Makefile.am
+++ b/src/plugins/tool/Makefile.am
@ -1,66 +1,66 @@
-# This is the src/plugins/tool 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/tool
-
-pkgdata_PYTHON = \
-	ChangeNames.py \
-	ChangeTypes.py \
-	Check.py \
-	Desbrowser.py \
-	Eval.py \
-	EventCmp.py \
-	EventNames.py \
-	ExtractCity.py \
-	FindDupes.py \
-	Leak.py \
-	MediaManager.py \
-	NotRelated.py \
-	OwnerEditor.py \
-	PatchNames.py \
-	Rebuild.py \
-	RebuildRefMap.py \
-	RelCalc.py \
-	RemoveUnused.py \
-	ReorderIds.py \
-	SortEvents.py \
-	SoundGen.py \
-	tools.gpr.py \
-	Verify.py
-#	DumpGenderStats.py \
-#	PHPGedViewConnector.py \
-#	TestcaseGenerator.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/tool
-pkgpythondir = @pkgpythondir@/plugins/tool
-
-GLADEFILES = \
-	changenames.glade \
-	changetypes.glade \
-	check.glade \
-	desbrowser.glade \
-	eval.glade \
-	eventcmp.glade \
-	finddupes.glade \
-	leak.glade \
-	notrelated.glade \
-	ownereditor.glade \
-	patchnames.glade \
-	phpgedview.glade \
-	relcalc.glade \
-	removeunused.glade \
-	soundgen.glade \
-	verify.glade
-
-dist_pkgdata_DATA = $(GLADEFILES)
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/tool 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
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/tool
+
+pkgpython_PYTHON = \
+	ChangeNames.py \
+	ChangeTypes.py \
+	Check.py \
+	Desbrowser.py \
+	Eval.py \
+	EventCmp.py \
+	EventNames.py \
+	ExtractCity.py \
+	FindDupes.py \
+	Leak.py \
+	MediaManager.py \
+	NotRelated.py \
+	OwnerEditor.py \
+	PatchNames.py \
+	Rebuild.py \
+	RebuildRefMap.py \
+	RelCalc.py \
+	RemoveUnused.py \
+	ReorderIds.py \
+	SortEvents.py \
+	SoundGen.py \
+	tools.gpr.py \
+	Verify.py
+#	DumpGenderStats.py \
+#	PHPGedViewConnector.py \
+#	TestcaseGenerator.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/tool
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/tool
+
+GLADEFILES = \
+	changenames.glade \
+	changetypes.glade \
+	check.glade \
+	desbrowser.glade \
+	eval.glade \
+	eventcmp.glade \
+	finddupes.glade \
+	leak.glade \
+	notrelated.glade \
+	ownereditor.glade \
+	patchnames.glade \
+	phpgedview.glade \
+	relcalc.glade \
+	removeunused.glade \
+	soundgen.glade \
+	verify.glade
+
+dist_pkgdata_DATA = $(GLADEFILES)
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/view/Makefile.am
+++ b/src/plugins/view/Makefile.am
@ -1,40 +1,39 @@
-# This is the src/plugins/quickview 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
-
-pkgdatadir = $(datadir)/@PACKAGE@/plugins/view
-
-pkgdata_PYTHON = \
-	eventview.py \
-	familyview.py \
-	fanchartview.gpr.py \
-	fanchartview.py \
-	geoview.py \
-	geoview.gpr.py \
-	grampletview.py \
-	htmlrenderer.py \
-	mediaview.py \
-	noteview.py \
-	pedigreeview.py \
-	personlistview.py \
-	persontreeview.py \
-	placelistview.py \
-	placetreeview.py \
-	placetreeview.gpr.py \
-	relview.py \
-	repoview.py \
-	sourceview.py \
-	view.gpr.py
-
-pkgpyexecdir = @pkgpyexecdir@/plugins/view
-pkgpythondir = @pkgpythondir@/plugins/view
-
-# Clean up all the byte-compiled files
-MOSTLYCLEANFILES = *pyc *pyo
-
-GRAMPS_PY_MODPATH = "../../"
-
-pycheck: 
-	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+# This is the src/plugins/quickview 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
+
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/view
+
+pkgpython_PYTHON = \
+	eventview.py \
+	familyview.py \
+	fanchartview.gpr.py \
+	fanchartview.py \
+	geoview.py \
+	geoview.gpr.py \
+	grampletview.py \
+	htmlrenderer.py \
+	mediaview.py \
+	noteview.py \
+	pedigreeview.py \
+	personlistview.py \
+	persontreeview.py \
+	placelistview.py \
+	placetreeview.py \
+	placetreeview.gpr.py \
+	relview.py \
+	repoview.py \
+	sourceview.py \
+	view.gpr.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/view
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/webreport/Makefile.am
+++ b/src/plugins/webreport/Makefile.am
@ -3,15 +3,14 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

-pkgdatadir = $(datadir)/@PACKAGE@/plugins/webreport
+pkgpythondir = $(datadir)/@PACKAGE@/plugins/webreport

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	NarrativeWeb.py\
 	WebCal.py\
 	webplugins.gpr.py

 pkgpyexecdir = @pkgpyexecdir@/plugins/webreport
-pkgpythondir = @pkgpythondir@/plugins/webreport

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -20,4 +19,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));