bug #5554: Automake problem

svn: r18851
2012-02-10 20:25:15 +00:00 · 2012-02-10 20:25:15 +00:00 · 53c9c30890
commit 53c9c30890
parent 8872ab4ec2
58 changed files with 182 additions and 234 deletions
--- a/src/DateHandler/Makefile.am
+++ b/src/DateHandler/Makefile.am
@ -4,9 +4,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\
@ -34,7 +32,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
@ -52,4 +50,4 @@ docs:

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

 SUBDIRS = Rules SideBar

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

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

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

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

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

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	_AllCitations.py \
 	_ChangedSince.py \
@ -22,7 +22,6 @@ pkgdata_PYTHON = \
 	_RegExpIdOf.py

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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -31,4 +30,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,9 +1,9 @@
 # This is the src/Filters/Rules/Event level Makefile for Gramps
 # $Id$

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSince.py\
 	_MatchesFilter.py\
 	_EventPrivate.py\
@ -26,7 +26,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
@ -35,4 +35,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,9 +1,9 @@
 # This is the src/Filters/Rules/Family level Makefile for Gramps
 # $Id$

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

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


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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -50,4 +49,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
@ -3,9 +3,9 @@

 SUBDIRS = Person Family Event Place Source MediaObject Repository Note Citation

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

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


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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -44,4 +43,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,9 +1,9 @@
 # This is the src/Filters/Rules/MediaObject level Makefile for Gramps
 # $Id$

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllMedia.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@ -19,7 +19,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
@ -28,4 +28,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,9 +1,9 @@
 # This is the src/Filters/Rules/Note level Makefile for Gramps
 # $Id$

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllNotes.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@ -18,7 +18,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
@ -27,4 +26,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,9 +1,9 @@
 # This is the src/Filters/Rules/Person level Makefile for Gramps
 # $Id$

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSince.py\
 	_Disconnected.py \
 	_DeepRelationshipPathBetween.py \
@ -84,7 +84,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
@ -93,4 +92,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,9 +1,9 @@
 # This is the src/Filters/Rules/Place level Makefile for Gramps
 # $Id$

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllPlaces.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@ -22,7 +22,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
@ -31,4 +30,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,9 +1,9 @@
 # This is the src/Filters/Rules/Media level Makefile for Gramps
 # $Id$

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_AllRepos.py\
 	_ChangedSince.py\
 	_HasIdOf.py\
@ -18,7 +18,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
@ -27,4 +26,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,9 +1,9 @@
 # This is the src/Filters/Rules/Source level Makefile for Gramps
 # $Id$

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	_ChangedSince.py\
 	_MatchesFilter.py\
 	_SourcePrivate.py\
@ -22,7 +22,6 @@ pkgdata_PYTHON = \
        _MatchesRepositoryFilter.py

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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -31,4 +30,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,9 +1,9 @@
 # This is the src/Filters/SideBar level Makefile for Gramps
 # $Id$

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

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

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

 # 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/GrampsLocale/Makefile.am
+++ b/src/GrampsLocale/Makefile.am
@ -4,16 +4,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 = 

@ -24,4 +22,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
@ -4,9 +4,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\
@ -14,7 +12,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
@ -23,4 +21,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
@ -4,9 +4,9 @@
 # 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 \
 	mergefamily.py \
@ -19,7 +19,6 @@ pkgdata_PYTHON = \
 	mergenote.py

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

 # 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/Simple/Makefile.am
+++ b/src/Simple/Makefile.am
@ -1,16 +1,15 @@
 # This is the src/Report level Makefile for Gramps
 # $Id$

-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
@ -19,4 +18,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
@ -7,9 +7,9 @@
 SUBDIRS = \
 	plug

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	arghandler.py \
 	argparser.py \
@ -18,7 +18,7 @@ pkgdata_PYTHON = \
 	user.py

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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -27,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/cli/plug/Makefile.am
+++ b/src/cli/plug/Makefile.am
@ -4,13 +4,13 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py

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


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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/gen/Makefile.am
+++ b/src/gen/Makefile.am
@ -13,17 +13,15 @@ SUBDIRS = \
 	proxy \
 	utils

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

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

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

 # 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/db/Makefile.am
+++ b/src/gen/db/Makefile.am
@ -4,9 +4,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 \
@ -21,7 +21,6 @@ pkgdata_PYTHON = \
 	write.py

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


 # Clean up all the byte-compiled files
@ -31,4 +30,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
@ -4,15 +4,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 = 

@ -23,4 +21,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
@ -4,9 +4,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 \
@ -74,7 +74,6 @@ pkgdata_PYTHON = \
 	witness.py 

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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -83,7 +82,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
@ -4,16 +4,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
@ -22,4 +21,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
@ -10,9 +10,9 @@ SUBDIRS = \
 	menu\
 	report

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

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

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

 # 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/gen/plug/docbackend/Makefile.am
+++ b/src/gen/plug/docbackend/Makefile.am
@ -4,16 +4,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
@ -22,4 +20,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
@ -6,7 +6,7 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	basedoc.py  \
 	drawdoc.py \
@ -21,7 +21,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
@ -31,4 +31,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
@ -4,9 +4,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 \
@ -29,8 +29,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
@ -39,4 +37,4 @@ GRAMPS_PY_MODPATH = "../../../"

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

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py\
 	_bibliography.py\
 	_constants.py\
@ -14,7 +14,7 @@ pkgdata_PYTHON = \
 	utils.py

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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -23,4 +23,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
@ -4,9 +4,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 \
@ -15,8 +15,6 @@ pkgdata_PYTHON = \
 	proxybase.py

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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -25,4 +23,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
@ -4,9 +4,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 \
@ -14,8 +14,6 @@ pkgdata_PYTHON = \
 	fallback.py

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

 # 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/gui/Makefile.am
+++ b/src/gui/Makefile.am
@ -11,9 +11,9 @@ SUBDIRS = \
 	views \
 	widgets

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	aboutdialog.py \
 	basesidebar.py \
@ -33,8 +33,6 @@ pkgdata_PYTHON = \
 	viewmanager.py

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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -43,4 +41,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
@ -7,9 +7,9 @@
 SUBDIRS = \
 	displaytabs

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

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

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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -48,4 +47,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,9 +1,9 @@
 # This is the src/gui/editors/displaytabs level Makefile for Gramps
 # $Id$

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	addrembedlist.py \
 	addressmodel.py \
 	attrembedlist.py \
@ -51,7 +51,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
@ -60,4 +59,4 @@ GRAMPS_PY_MODPATH = "../../../"

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

 SUBDIRS = report

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py\
 	_guioptions.py\
 	_windows.py\
@ -16,7 +16,6 @@ pkgdata_PYTHON = \
 	tool.py

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

 # 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/gui/plug/report/Makefile.am
+++ b/src/gui/plug/report/Makefile.am
@ -1,9 +1,9 @@
 # This is the src/gui/plug/report level Makefile for Gramps
 # $Id$

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py\
 	_docreportdialog.py\
 	_drawreportdialog.py\
@ -17,7 +17,6 @@ pkgdata_PYTHON = \
 	_webreportdialog.py

 pkgpyexecdir = @pkgpyexecdir@/gui/plug/report
-pkgpythondir = @pkgpythondir@/gui/plug/report

 # 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/gui/selectors/Makefile.am
+++ b/src/gui/selectors/Makefile.am
@ -4,9 +4,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 \
 	selectcitation.py \
@ -22,7 +22,6 @@ pkgdata_PYTHON = \
 	selectorfactory.py

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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -31,4 +30,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
@ -7,9 +7,9 @@
 SUBDIRS = \
 	treemodels

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	__init__.py \
 	listview.py \
 	navigationview.py \
@ -17,7 +17,6 @@ pkgdata_PYTHON = \
 	tags.py

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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -26,7 +25,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
@ -4,9 +4,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 \
@ -23,7 +23,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
@ -32,7 +31,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
@ -4,9 +4,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 \
 	basicentry.py \
 	buttons.py \
@ -35,7 +35,6 @@ pkgdata_PYTHON = \
 	valuetoolitem.py

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

 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo
@ -44,5 +43,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
@ -24,14 +24,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
@ -49,4 +49,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
@ -6,7 +6,7 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	AsciiDoc.py \
 	docgen.gpr.py\
 	GtkPrint.py \
@ -19,7 +19,7 @@ pkgdata_PYTHON = \
 	SvgDrawDoc.py

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

 GLADEFILES = \
 	gtkprint.glade 
@ -37,4 +37,4 @@ GRAMPS_PY_MODPATH = "../../"

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

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	AncestorTree.py \
 	Calendar.py\
 	DescendTree.py \
@ -16,7 +16,6 @@ pkgdata_PYTHON = \
 	TimeLine.py

 pkgpyexecdir = @pkgpyexecdir@/plugins/drawreport
-pkgpythondir = @pkgpythondir@/plugins/drawreport

 # 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/plugins/export/Makefile.am
+++ b/src/plugins/export/Makefile.am
@ -6,7 +6,7 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	export.gpr.py \
 	ExportCsv.py \
 	ExportFtree.py \
@ -18,7 +18,7 @@ pkgdata_PYTHON = \
 	ExportXml.py

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

 GLADEFILES = \
 	exportcsv.glade \
@ -41,4 +41,4 @@ GRAMPS_PY_MODPATH = "../../"

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

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	AgeOnDateGramplet.py \
 	AgeStats.py \
 	Attributes.py \
@ -45,7 +45,6 @@ pkgdata_PYTHON = \
 	WhatsNext.py

 pkgpyexecdir = @pkgpyexecdir@/plugins/gramplet
-pkgpythondir = @pkgpythondir@/plugins/gramplet

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

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

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

-pkgdata_PYTHON = \
+pkgpython_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
@ -22,4 +21,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/import/Makefile.am
+++ b/src/plugins/import/Makefile.am
@ -6,7 +6,7 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	import.gpr.py \
 	ImportCsv.py \
 	ImportGedcom.py \
@ -18,7 +18,7 @@ pkgdata_PYTHON = \
 	ImportXml.py

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

 GLADEFILES = \
 	importgedcom.glade
@ -36,4 +36,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/lib/Makefile.am
+++ b/src/plugins/lib/Makefile.am
@ -15,7 +15,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/lib

 SUBDIRS = maps

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	libcairodoc.py\
 	libformatting.py\
 	libgedcom.py\
@ -38,7 +38,7 @@ pkgdata_PYTHON = \
 	libtreebase.py

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

 GLADEFILES = 

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/lib/maps/Makefile.am
+++ b/src/plugins/lib/maps/Makefile.am
@ -1,14 +1,14 @@
 pkgdatadir = $(datadir)/@PACKAGE@/plugins/lib/maps
 # $Id$

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	constants.py\
 	geography.py\
 	grampsmaps.py\
 	__init__.py

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/mapservices/Makefile.am
+++ b/src/plugins/mapservices/Makefile.am
@ -6,14 +6,14 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	googlemap.py\
 	mapservice.gpr.py\
 	openstreetmap.py\
 	eniroswedenmap.py

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

 GLADEFILES = 

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/quickview/Makefile.am
+++ b/src/plugins/quickview/Makefile.am
@ -6,7 +6,7 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	AgeOnDate.py \
 	all_events.py \
 	all_relations.py \
@ -22,7 +22,7 @@ pkgdata_PYTHON = \
 	siblings.py

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

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/rel/Makefile.am
+++ b/src/plugins/rel/Makefile.am
@ -6,7 +6,7 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	relplugins.gpr.py\
        rel_ca.py\
 	rel_cs.py\
@ -28,7 +28,7 @@ pkgdata_PYTHON = \
 	rel_sv.py

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

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

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

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	categorysidebar.py\
 	sidebar.gpr.py

 pkgpyexecdir = @pkgpyexecdir@/plugins/sidebar
-pkgpythondir = @pkgpythondir@/plugins/sidebar

 # 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));
--- a/src/plugins/textreport/Makefile.am
+++ b/src/plugins/textreport/Makefile.am
@ -4,9 +4,9 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	AncestorReport.py\
 	BirthdayReport.py\
 	CustomBookText.py\
@ -25,7 +25,6 @@ pkgdata_PYTHON = \
 	textplugins.gpr.py

 pkgpyexecdir = @pkgpyexecdir@/plugins/textreport
-pkgpythondir = @pkgpythondir@/plugins/textreport

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/tool/Makefile.am
+++ b/src/plugins/tool/Makefile.am
@ -6,7 +6,7 @@

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	ChangeNames.py \
 	ChangeTypes.py \
 	Check.py \
@ -36,7 +36,7 @@ pkgdata_PYTHON = \
 #	TestcaseGenerator.py

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

 GLADEFILES = \
 	changenames.glade \
@ -66,4 +66,4 @@ GRAMPS_PY_MODPATH = "../../"

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

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
 	citationlistview.py \
 	citationtreeview.py \
 	eventview.py \
@ -35,7 +35,6 @@ pkgdata_PYTHON = \
 	view.gpr.py

 pkgpyexecdir = @pkgpyexecdir@/plugins/view
-pkgpythondir = @pkgpythondir@/plugins/view

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

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/webreport/Makefile.am
+++ b/src/plugins/webreport/Makefile.am
@ -4,15 +4,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
@ -21,4 +20,4 @@ GRAMPS_PY_MODPATH = "../../"

 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgdata_PYTHON));
+	pychecker $(pkgpython_PYTHON));
--- a/src/plugins/webstuff/Makefile.am
+++ b/src/plugins/webstuff/Makefile.am
@ -9,12 +9,12 @@ SUBDIRS = css images js

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

-pkgdata_PYTHON = \
+pkgpython_PYTHON = \
      webstuff.py \
      webstuff.gpr.py

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

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

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