From 952dcb2e65afacb58e54c48b1deaba29c36b6046 Mon Sep 17 00:00:00 2001 From: Josip Pisoj Date: Fri, 10 Feb 2012 20:13:31 +0000 Subject: [PATCH] bug #5554: Automake problem svn: r18849 --- src/DateHandler/Makefile.am | 6 +++--- src/Filters/Makefile.am | 6 +++--- src/Filters/Rules/Event/Makefile.am | 6 +++--- src/Filters/Rules/Family/Makefile.am | 6 +++--- src/Filters/Rules/Makefile.am | 6 +++--- src/Filters/Rules/MediaObject/Makefile.am | 6 +++--- src/Filters/Rules/Note/Makefile.am | 6 +++--- src/Filters/Rules/Person/Makefile.am | 6 +++--- src/Filters/Rules/Place/Makefile.am | 6 +++--- src/Filters/Rules/Repository/Makefile.am | 6 +++--- src/Filters/Rules/Source/Makefile.am | 6 +++--- src/Filters/SideBar/Makefile.am | 7 +++---- src/GrampsLocale/Makefile.am | 6 +++--- src/GrampsLogger/Makefile.am | 6 +++--- src/Merge/Makefile.am | 6 +++--- src/Simple/Makefile.am | 6 +++--- src/cli/Makefile.am | 8 ++++---- src/cli/plug/Makefile.am | 6 +++--- src/gen/Makefile.am | 6 +++--- src/gen/db/Makefile.am | 6 +++--- src/gen/display/Makefile.am | 6 +++--- src/gen/lib/Makefile.am | 8 ++++---- src/gen/mime/Makefile.am | 6 +++--- src/gen/plug/Makefile.am | 6 +++--- src/gen/plug/docbackend/Makefile.am | 6 +++--- src/gen/plug/docgen/Makefile.am | 6 +++--- src/gen/plug/menu/Makefile.am | 7 +++---- src/gen/plug/report/Makefile.am | 6 +++--- src/gen/proxy/Makefile.am | 6 +++--- src/gen/utils/Makefile.am | 6 +++--- src/gui/Makefile.am | 6 +++--- src/gui/editors/Makefile.am | 6 +++--- src/gui/editors/displaytabs/Makefile.am | 6 +++--- src/gui/plug/Makefile.am | 6 +++--- src/gui/plug/report/Makefile.am | 6 +++--- src/gui/selectors/Makefile.am | 6 +++--- src/gui/views/Makefile.am | 8 ++++---- src/gui/views/treemodels/Makefile.am | 8 ++++---- src/gui/widgets/Makefile.am | 6 +++--- src/plugins/Makefile.am | 6 +++--- src/plugins/docgen/Makefile.am | 6 +++--- src/plugins/drawreport/Makefile.am | 6 +++--- src/plugins/export/Makefile.am | 6 +++--- src/plugins/gramplet/Makefile.am | 6 +++--- src/plugins/graph/Makefile.am | 6 +++--- src/plugins/import/Makefile.am | 6 +++--- src/plugins/lib/Makefile.am | 6 +++--- src/plugins/lib/maps/Makefile.am | 6 +++--- src/plugins/mapservices/Makefile.am | 6 +++--- src/plugins/quickview/Makefile.am | 6 +++--- src/plugins/rel/Makefile.am | 12 ++++++------ src/plugins/sidebar/Makefile.am | 6 +++--- src/plugins/textreport/Makefile.am | 8 ++++---- src/plugins/tool/Makefile.am | 6 +++--- src/plugins/view/Makefile.am | 6 +++--- src/plugins/webreport/Makefile.am | 6 +++--- src/plugins/webstuff/Makefile.am | 6 +++--- 57 files changed, 179 insertions(+), 181 deletions(-) diff --git a/src/DateHandler/Makefile.am b/src/DateHandler/Makefile.am index 54bc3ae24..724f006aa 100644 --- a/src/DateHandler/Makefile.am +++ b/src/DateHandler/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/DateHandler -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _Date_bg.py\ _Date_ca.py\ _Date_cs.py\ @@ -33,7 +33,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 @@ -51,4 +51,4 @@ docs: pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/Filters/Makefile.am b/src/Filters/Makefile.am index 99682e96e..27cdd7050 100644 --- a/src/Filters/Makefile.am +++ b/src/Filters/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = Rules SideBar pkgdatadir = $(datadir)/@PACKAGE@/Filters -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _FilterComboBox.py \ _FilterList.py \ _FilterMenu.py \ @@ -17,7 +17,7 @@ pkgdata_PYTHON = \ _SearchFilter.py pkgpyexecdir = @pkgpyexecdir@/Filters -pkgpythondir = @pkgpythondir@/Filters +pkgpythondir = $(datadir)/@PACKAGE@/Filters # 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)); diff --git a/src/Filters/Rules/Event/Makefile.am b/src/Filters/Rules/Event/Makefile.am index 5d6f498bf..5f7973cfc 100644 --- a/src/Filters/Rules/Event/Makefile.am +++ b/src/Filters/Rules/Event/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(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 +pkgpythondir = $(datadir)/@PACKAGE@/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)); diff --git a/src/Filters/Rules/Family/Makefile.am b/src/Filters/Rules/Family/Makefile.am index eb8a8d5fb..811efe8c3 100644 --- a/src/Filters/Rules/Family/Makefile.am +++ b/src/Filters/Rules/Family/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Family -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _AllFamilies.py\ _ChangedSince.py\ _FamilyPrivate.py\ @@ -39,7 +39,7 @@ pkgdata_PYTHON = \ pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Family -pkgpythondir = @pkgpythondir@/Filters/Rules/Family +pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Family # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -48,4 +48,4 @@ GRAMPS_PY_MODPATH = "../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/Filters/Rules/Makefile.am b/src/Filters/Rules/Makefile.am index 552ff18fa..2d6490c59 100644 --- a/src/Filters/Rules/Makefile.am +++ b/src/Filters/Rules/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = Person Family Event Place Source MediaObject Repository Note pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _ChangedSinceBase.py\ _Everything.py\ _HasEventBase.py\ @@ -31,7 +31,7 @@ pkgdata_PYTHON = \ pkgpyexecdir = @pkgpyexecdir@/Filters/Rules -pkgpythondir = @pkgpythondir@/Filters/Rules +pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -40,4 +40,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/Filters/Rules/MediaObject/Makefile.am b/src/Filters/Rules/MediaObject/Makefile.am index 4e296ccfc..217231b27 100644 --- a/src/Filters/Rules/MediaObject/Makefile.am +++ b/src/Filters/Rules/MediaObject/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/MediaObject -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _AllMedia.py\ _ChangedSince.py\ _HasIdOf.py\ @@ -18,7 +18,7 @@ pkgdata_PYTHON = \ __init__.py pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/MediaObject -pkgpythondir = @pkgpythondir@/Filters/Rules/MediaObject +pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/MediaObject # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -27,4 +27,4 @@ GRAMPS_PY_MODPATH = "../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/Filters/Rules/Note/Makefile.am b/src/Filters/Rules/Note/Makefile.am index b30456927..99c901574 100644 --- a/src/Filters/Rules/Note/Makefile.am +++ b/src/Filters/Rules/Note/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Note -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _AllNotes.py\ _ChangedSince.py\ _HasIdOf.py\ @@ -17,7 +17,7 @@ pkgdata_PYTHON = \ __init__.py pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Note -pkgpythondir = @pkgpythondir@/Filters/Rules/Note +pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Note # 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)); diff --git a/src/Filters/Rules/Person/Makefile.am b/src/Filters/Rules/Person/Makefile.am index 3e340ec8f..f5d7799ac 100644 --- a/src/Filters/Rules/Person/Makefile.am +++ b/src/Filters/Rules/Person/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Person -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _ChangedSince.py\ _Disconnected.py \ _DeepRelationshipPathBetween.py \ @@ -80,7 +80,7 @@ pkgdata_PYTHON = \ __init__.py pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Person -pkgpythondir = @pkgpythondir@/Filters/Rules/Person +pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Person # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -89,4 +89,4 @@ GRAMPS_PY_MODPATH = "../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/Filters/Rules/Place/Makefile.am b/src/Filters/Rules/Place/Makefile.am index c5097315a..967412d27 100644 --- a/src/Filters/Rules/Place/Makefile.am +++ b/src/Filters/Rules/Place/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Place -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _AllPlaces.py\ _ChangedSince.py\ _HasIdOf.py\ @@ -21,7 +21,7 @@ pkgdata_PYTHON = \ __init__.py pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Place -pkgpythondir = @pkgpythondir@/Filters/Rules/Place +pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Place # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -30,4 +30,4 @@ GRAMPS_PY_MODPATH = "../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/Filters/Rules/Repository/Makefile.am b/src/Filters/Rules/Repository/Makefile.am index 62d0ea383..9997acdfe 100644 --- a/src/Filters/Rules/Repository/Makefile.am +++ b/src/Filters/Rules/Repository/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Repository -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _AllRepos.py\ _ChangedSince.py\ _HasIdOf.py\ @@ -17,7 +17,7 @@ pkgdata_PYTHON = \ __init__.py pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Repository -pkgpythondir = @pkgpythondir@/Filters/Rules/Repository +pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Repository # 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)); diff --git a/src/Filters/Rules/Source/Makefile.am b/src/Filters/Rules/Source/Makefile.am index 5c36fcdfb..5774a5a8b 100644 --- a/src/Filters/Rules/Source/Makefile.am +++ b/src/Filters/Rules/Source/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Source -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _ChangedSince.py\ _MatchesFilter.py\ _SourcePrivate.py\ @@ -22,7 +22,7 @@ pkgdata_PYTHON = \ _MatchesRepositoryFilter.py pkgpyexecdir = @pkgpyexecdir@/Filters/Rules/Source -pkgpythondir = @pkgpythondir@/Filters/Rules/Source +pkgpythondir = $(datadir)/@PACKAGE@/Filters/Rules/Source # 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)); diff --git a/src/Filters/SideBar/Makefile.am b/src/Filters/SideBar/Makefile.am index 404497a04..2c3ab1742 100644 --- a/src/Filters/SideBar/Makefile.am +++ b/src/Filters/SideBar/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/SideBar -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _EventSidebarFilter.py \ _FamilySidebarFilter.py \ __init__.py \ @@ -15,8 +15,7 @@ pkgdata_PYTHON = \ _NoteSidebarFilter.py pkgpyexecdir = @pkgpyexecdir@/Filters/SideBar -pkgpythondir = @pkgpythondir@/Filters/SideBar - +pkgpythondir = $(datadir)/@PACKAGE@/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)); diff --git a/src/GrampsLocale/Makefile.am b/src/GrampsLocale/Makefile.am index a1deda683..89b9dc206 100644 --- a/src/GrampsLocale/Makefile.am +++ b/src/GrampsLocale/Makefile.am @@ -5,13 +5,13 @@ pkgdatadir = $(datadir)/@PACKAGE@/GrampsLocale -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _GrampsLocale.py\ __init__.py pkgpyexecdir = @pkgpyexecdir@/GrampsLocale -pkgpythondir = @pkgpythondir@/GrampsLocale +pkgpythondir = $(datadir)/@PACKAGE@/GrampsLocale dist_pkgdata_DATA = @@ -23,4 +23,4 @@ GRAMPS_PY_MODPATH = "../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/GrampsLogger/Makefile.am b/src/GrampsLogger/Makefile.am index 75399fc48..292aefbed 100644 --- a/src/GrampsLogger/Makefile.am +++ b/src/GrampsLogger/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/GrampsLogger -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _ErrorReportAssistant.py\ _ErrorView.py\ _GtkHandler.py\ @@ -13,7 +13,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 +22,4 @@ GRAMPS_PY_MODPATH = "../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/Merge/Makefile.am b/src/Merge/Makefile.am index f2e4999c3..80b5129e6 100644 --- a/src/Merge/Makefile.am +++ b/src/Merge/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Merge -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ mergeperson.py \ mergefamily.py \ @@ -17,7 +17,7 @@ pkgdata_PYTHON = \ mergenote.py pkgpyexecdir = @pkgpyexecdir@/Merge -pkgpythondir = @pkgpythondir@/Merge +pkgpythondir = $(datadir)/@PACKAGE@/Merge # 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)); diff --git a/src/Simple/Makefile.am b/src/Simple/Makefile.am index 4987a1feb..0a62cfc67 100644 --- a/src/Simple/Makefile.am +++ b/src/Simple/Makefile.am @@ -2,14 +2,14 @@ pkgdatadir = $(datadir)/@PACKAGE@/Simple -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ _SimpleDoc.py\ _SimpleAccess.py\ _SimpleTable.py\ __init__.py pkgpyexecdir = @pkgpyexecdir@/Simple -pkgpythondir = @pkgpythondir@/Simple +pkgpythondir = $(datadir)/@PACKAGE@/Simple # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -18,4 +18,4 @@ GRAMPS_PY_MODPATH = "../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index 4271b3693..8cf39f88a 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am @@ -8,7 +8,7 @@ SUBDIRS = \ pkgdatadir = $(datadir)/@PACKAGE@/cli -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ arghandler.py \ argparser.py \ @@ -16,7 +16,7 @@ pkgdata_PYTHON = \ grampscli.py pkgpyexecdir = @pkgpyexecdir@/cli -pkgpythondir = @pkgpythondir@/cli +pkgpythondir = $(datadir)/@PACKAGE@/cli # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -25,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 diff --git a/src/cli/plug/Makefile.am b/src/cli/plug/Makefile.am index 144639a5e..f61cefd23 100644 --- a/src/cli/plug/Makefile.am +++ b/src/cli/plug/Makefile.am @@ -5,11 +5,11 @@ pkgdatadir = $(datadir)/@PACKAGE@/cli/plug -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py pkgpyexecdir = @pkgpyexecdir@/cli/plug -pkgpythondir = @pkgpythondir@/cli/plug +pkgpythondir = $(datadir)/@PACKAGE@/cli/plug # Clean up all the byte-compiled files @@ -19,4 +19,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gen/Makefile.am b/src/gen/Makefile.am index ed5bc7c82..7a9359627 100644 --- a/src/gen/Makefile.am +++ b/src/gen/Makefile.am @@ -14,13 +14,13 @@ SUBDIRS = \ pkgdatadir = $(datadir)/@PACKAGE@/gen -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ ggettext.py \ updatecallback.py pkgpyexecdir = @pkgpyexecdir@/gen -pkgpythondir = @pkgpythondir@/gen +pkgpythondir = $(datadir)/@PACKAGE@/gen # 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)); diff --git a/src/gen/db/Makefile.am b/src/gen/db/Makefile.am index e204e4a11..1dd2b9835 100644 --- a/src/gen/db/Makefile.am +++ b/src/gen/db/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gen/db -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ backup.py \ base.py \ @@ -20,7 +20,7 @@ pkgdata_PYTHON = \ write.py pkgpyexecdir = @pkgpyexecdir@/gen/db -pkgpythondir = @pkgpythondir@/gen/db +pkgpythondir = $(datadir)/@PACKAGE@/gen/db # 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)); diff --git a/src/gen/display/Makefile.am b/src/gen/display/Makefile.am index 92d41c255..01798b423 100644 --- a/src/gen/display/Makefile.am +++ b/src/gen/display/Makefile.am @@ -5,12 +5,12 @@ pkgdatadir = $(datadir)/@PACKAGE@/gen/display -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ name.py\ __init__.py pkgpyexecdir = @pkgpyexecdir@/gen/display -pkgpythondir = @pkgpythondir@/gen/display +pkgpythondir = $(datadir)/@PACKAGE@/gen/display dist_pkgdata_DATA = @@ -22,4 +22,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gen/lib/Makefile.am b/src/gen/lib/Makefile.am index a8fc70c6c..5b85b6902 100644 --- a/src/gen/lib/Makefile.am +++ b/src/gen/lib/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gen/lib -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ addressbase.py \ address.py \ attrbase.py \ @@ -73,7 +73,7 @@ pkgdata_PYTHON = \ witness.py pkgpyexecdir = @pkgpyexecdir@/gen/lib -pkgpythondir = @pkgpythondir@/gen/lib +pkgpythondir = $(datadir)/@PACKAGE@/gen/lib # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -82,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) diff --git a/src/gen/mime/Makefile.am b/src/gen/mime/Makefile.am index 73cedab21..107179074 100644 --- a/src/gen/mime/Makefile.am +++ b/src/gen/mime/Makefile.am @@ -5,14 +5,14 @@ pkgdatadir = $(datadir)/@PACKAGE@/gen/mime -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py\ _gnomemime.py\ _winmime.py\ _pythonmime.py pkgpyexecdir = @pkgpyexecdir@/gen/mime -pkgpythondir = @pkgpythondir@/gen/mime +pkgpythondir = $(datadir)/@PACKAGE@/gen/mime # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -21,4 +21,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gen/plug/Makefile.am b/src/gen/plug/Makefile.am index a31a1af46..c2068293e 100644 --- a/src/gen/plug/Makefile.am +++ b/src/gen/plug/Makefile.am @@ -11,7 +11,7 @@ SUBDIRS = \ pkgdatadir = $(datadir)/@PACKAGE@/gen/plug -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ _docgenplugin.py \ _export.py \ @@ -24,7 +24,7 @@ pkgdata_PYTHON = \ utils.py pkgpyexecdir = @pkgpyexecdir@/gen/plug -pkgpythondir = @pkgpythondir@/gen/plug +pkgpythondir = $(datadir)/@PACKAGE@/gen/plug # Clean up all the byte-compiled files @@ -34,4 +34,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gen/plug/docbackend/Makefile.am b/src/gen/plug/docbackend/Makefile.am index 0945023ae..85e594e7b 100644 --- a/src/gen/plug/docbackend/Makefile.am +++ b/src/gen/plug/docbackend/Makefile.am @@ -5,13 +5,13 @@ pkgdatadir = $(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 +pkgpythondir = $(datadir)/@PACKAGE@/gen/plug/docbackend # Clean up all the byte-compiled files @@ -21,4 +21,4 @@ GRAMPS_PY_MODPATH = "../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gen/plug/docgen/Makefile.am b/src/gen/plug/docgen/Makefile.am index 5557d5687..509ee9510 100644 --- 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)); diff --git a/src/gen/plug/menu/Makefile.am b/src/gen/plug/menu/Makefile.am index 80837d9aa..a816c01bc 100644 --- a/src/gen/plug/menu/Makefile.am +++ b/src/gen/plug/menu/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gen/plug/menu -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ _boolean.py \ _booleanlist.py \ @@ -28,8 +28,7 @@ pkgdata_PYTHON = \ _text.py pkgpyexecdir = @pkgpyexecdir@/gen/plug/menu -pkgpythondir = @pkgpythondir@/gen/plug/menu - +pkgpythondir = $(datadir)/@PACKAGE@/gen/plug/menu # 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)); diff --git a/src/gen/plug/report/Makefile.am b/src/gen/plug/report/Makefile.am index 359f24010..bdf0828b7 100644 --- a/src/gen/plug/report/Makefile.am +++ b/src/gen/plug/report/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gen/plug/report -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py\ _bibliography.py\ _constants.py\ @@ -13,7 +13,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 @@ -22,4 +22,4 @@ GRAMPS_PY_MODPATH = "../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gen/proxy/Makefile.am b/src/gen/proxy/Makefile.am index 49aef7fca..56bbfb383 100644 --- a/src/gen/proxy/Makefile.am +++ b/src/gen/proxy/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gen/proxy -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ filter.py \ living.py \ @@ -15,7 +15,7 @@ pkgdata_PYTHON = \ proxybase.py pkgpyexecdir = @pkgpyexecdir@/gen/proxy -pkgpythondir = @pkgpythondir@/gen/proxy +pkgpythondir = $(datadir)/@PACKAGE@/gen/proxy # Clean up all the byte-compiled files @@ -25,4 +25,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gen/utils/Makefile.am b/src/gen/utils/Makefile.am index 2c8773d08..c8300e04c 100644 --- a/src/gen/utils/Makefile.am +++ b/src/gen/utils/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gen/utils -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ callback.py \ callman.py \ @@ -13,7 +13,7 @@ pkgdata_PYTHON = \ fallback.py pkgpyexecdir = @pkgpyexecdir@/gen/utils -pkgpythondir = @pkgpythondir@/gen/utils +pkgpythondir = $(datadir)/@PACKAGE@/gen/utils # Clean up all the byte-compiled files @@ -23,4 +23,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 382f31258..2b84244e8 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS = \ pkgdatadir = $(datadir)/@PACKAGE@/gui -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ aboutdialog.py \ basesidebar.py \ @@ -31,7 +31,7 @@ pkgdata_PYTHON = \ viewmanager.py pkgpyexecdir = @pkgpyexecdir@/gui -pkgpythondir = @pkgpythondir@/gui +pkgpythondir = $(datadir)/@PACKAGE@/gui # Clean up all the byte-compiled files @@ -41,4 +41,4 @@ GRAMPS_PY_MODPATH = "../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gui/editors/Makefile.am b/src/gui/editors/Makefile.am index 9dfb1d2dc..df17c4f76 100644 --- a/src/gui/editors/Makefile.am +++ b/src/gui/editors/Makefile.am @@ -8,7 +8,7 @@ SUBDIRS = \ pkgdatadir = $(datadir)/@PACKAGE@/gui/editors -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ addmedia.py\ __init__.py\ editaddress.py \ @@ -38,7 +38,7 @@ pkgdata_PYTHON = \ objectentries.py pkgpyexecdir = @pkgpyexecdir@/gui/editors -pkgpythondir = @pkgpythondir@/gui/editors +pkgpythondir = $(datadir)/@PACKAGE@/gui/editors # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -47,4 +47,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gui/editors/displaytabs/Makefile.am b/src/gui/editors/displaytabs/Makefile.am index 615a008b1..ed811ef7d 100644 --- a/src/gui/editors/displaytabs/Makefile.am +++ b/src/gui/editors/displaytabs/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gui/editors/displaytabs -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ addrembedlist.py \ addressmodel.py \ attrembedlist.py \ @@ -49,7 +49,7 @@ pkgdata_PYTHON = \ __init__.py pkgpyexecdir = @pkgpyexecdir@/gui/editors/displaytabs -pkgpythondir = @pkgpythondir@/gui/editors/displaytabs +pkgpythondir = $(datadir)/@PACKAGE@/gui/editors/displaytabs # clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -58,4 +58,4 @@ GRAMPS_PY_MODPATH = "../../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gui/plug/Makefile.am b/src/gui/plug/Makefile.am index 263388e90..525f3db81 100644 --- a/src/gui/plug/Makefile.am +++ b/src/gui/plug/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = report pkgdatadir = $(datadir)/@PACKAGE@/gui/plug -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py\ _guioptions.py\ _windows.py\ @@ -15,7 +15,7 @@ pkgdata_PYTHON = \ tool.py pkgpyexecdir = @pkgpyexecdir@/gui/plug -pkgpythondir = @pkgpythondir@/gui/plug +pkgpythondir = $(datadir)/@PACKAGE@/gui/plug # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -24,4 +24,4 @@ GRAMPS_PY_MODPATH = "../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gui/plug/report/Makefile.am b/src/gui/plug/report/Makefile.am index 8a3f3dbda..219ad7421 100644 --- a/src/gui/plug/report/Makefile.am +++ b/src/gui/plug/report/Makefile.am @@ -2,7 +2,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gui/plug/report -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py\ _docreportdialog.py\ _drawreportdialog.py\ @@ -17,7 +17,7 @@ pkgdata_PYTHON = \ _webreportdialog.py pkgpyexecdir = @pkgpyexecdir@/gui/plug/report -pkgpythondir = @pkgpythondir@/gui/plug/report +pkgpythondir = $(datadir)/@PACKAGE@/gui/plug/report # 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)); diff --git a/src/gui/selectors/Makefile.am b/src/gui/selectors/Makefile.am index ef318b790..7a2f91cf8 100644 --- a/src/gui/selectors/Makefile.am +++ b/src/gui/selectors/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gui/selectors -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ baseselector.py \ selectevent.py \ @@ -20,7 +20,7 @@ pkgdata_PYTHON = \ selectorfactory.py pkgpyexecdir = @pkgpyexecdir@/gui/selectors -pkgpythondir = @pkgpythondir@/gui/selectors +pkgpythondir = $(datadir)/@PACKAGE@/gui/selectors # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -29,4 +29,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/gui/views/Makefile.am b/src/gui/views/Makefile.am index 3d7fac2c7..98ab61a82 100644 --- a/src/gui/views/Makefile.am +++ b/src/gui/views/Makefile.am @@ -8,7 +8,7 @@ SUBDIRS = \ pkgdatadir = $(datadir)/@PACKAGE@/gui/views -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ listview.py \ navigationview.py \ @@ -16,7 +16,7 @@ pkgdata_PYTHON = \ tags.py pkgpyexecdir = @pkgpyexecdir@/gui/views -pkgpythondir = @pkgpythondir@/gui/views +pkgpythondir = $(datadir)/@PACKAGE@/gui/views # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -25,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 diff --git a/src/gui/views/treemodels/Makefile.am b/src/gui/views/treemodels/Makefile.am index 8499b308c..5b1ae83ee 100644 --- a/src/gui/views/treemodels/Makefile.am +++ b/src/gui/views/treemodels/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gui/views/treemodels -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ eventmodel.py \ familymodel.py \ @@ -19,7 +19,7 @@ pkgdata_PYTHON = \ treebasemodel.py pkgpyexecdir = @pkgpyexecdir@/gui/views/treemodels -pkgpythondir = @pkgpythondir@/gui/views/treemodels +pkgpythondir = $(datadir)/@PACKAGE@/gui/views/treemodels # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -28,7 +28,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 diff --git a/src/gui/widgets/Makefile.am b/src/gui/widgets/Makefile.am index b6a92d9eb..670c72d40 100644 --- a/src/gui/widgets/Makefile.am +++ b/src/gui/widgets/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/gui/widgets -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ __init__.py \ buttons.py \ expandcollapsearrow.py \ @@ -33,7 +33,7 @@ pkgdata_PYTHON = \ valuetoolitem.py pkgpyexecdir = @pkgpyexecdir@/gui/widgets -pkgpythondir = @pkgpythondir@/gui/widgets +pkgpythondir = $(datadir)/@PACKAGE@/gui/widgets # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -42,5 +42,5 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index bbd99bce3..fd37c7df3 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -23,14 +23,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 @@ -48,4 +48,4 @@ GRAMPS_PY_MODPATH = "../:../docgen" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/docgen/Makefile.am b/src/plugins/docgen/Makefile.am index da0f1b9cf..52b6be691 100644 --- a/src/plugins/docgen/Makefile.am +++ b/src/plugins/docgen/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/docgen -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ AsciiDoc.py \ docgen.gpr.py\ GtkPrint.py \ @@ -18,7 +18,7 @@ pkgdata_PYTHON = \ SvgDrawDoc.py pkgpyexecdir = @pkgpyexecdir@/plugins/docgen -pkgpythondir = @pkgpythondir@/plugins/docgen +pkgpythondir = $(datadir)/@PACKAGE@/plugins/docgen GLADEFILES = \ gtkprint.glade @@ -36,4 +36,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/drawreport/Makefile.am b/src/plugins/drawreport/Makefile.am index 3ba36cc57..4d3a9ce60 100644 --- a/src/plugins/drawreport/Makefile.am +++ b/src/plugins/drawreport/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/drawreport -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ AncestorTree.py \ Calendar.py\ DescendTree.py \ @@ -15,7 +15,7 @@ pkgdata_PYTHON = \ TimeLine.py pkgpyexecdir = @pkgpyexecdir@/plugins/drawreport -pkgpythondir = @pkgpythondir@/plugins/drawreport +pkgpythondir = $(datadir)/@PACKAGE@/plugins/drawreport # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -24,4 +24,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/export/Makefile.am b/src/plugins/export/Makefile.am index 8b4ad1db4..7015d1ca6 100644 --- a/src/plugins/export/Makefile.am +++ b/src/plugins/export/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/export -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ export.gpr.py \ ExportCsv.py \ ExportFtree.py \ @@ -17,7 +17,7 @@ pkgdata_PYTHON = \ ExportXml.py pkgpyexecdir = @pkgpyexecdir@/plugins/export -pkgpythondir = @pkgpythondir@/plugins/export +pkgpythondir = $(datadir)/@PACKAGE@/plugins/export GLADEFILES = \ exportcsv.glade \ @@ -40,4 +40,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/gramplet/Makefile.am b/src/plugins/gramplet/Makefile.am index 52d61e08d..73fe119a5 100644 --- a/src/plugins/gramplet/Makefile.am +++ b/src/plugins/gramplet/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/gramplet -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ AgeOnDateGramplet.py \ AgeStats.py \ Attributes.py \ @@ -44,7 +44,7 @@ pkgdata_PYTHON = \ WhatsNext.py pkgpyexecdir = @pkgpyexecdir@/plugins/gramplet -pkgpythondir = @pkgpythondir@/plugins/gramplet +pkgpythondir = $(datadir)/@PACKAGE@/plugins/gramplet # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -53,4 +53,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/graph/Makefile.am b/src/plugins/graph/Makefile.am index 5ed97a96b..efbfbb035 100644 --- a/src/plugins/graph/Makefile.am +++ b/src/plugins/graph/Makefile.am @@ -5,14 +5,14 @@ pkgdatadir = $(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 +pkgpythondir = $(datadir)/@PACKAGE@/plugins/graph # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -21,4 +21,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/import/Makefile.am b/src/plugins/import/Makefile.am index 49c253ad6..9bcd0d8ad 100644 --- a/src/plugins/import/Makefile.am +++ b/src/plugins/import/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/import -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ import.gpr.py \ ImportCsv.py \ ImportGedcom.py \ @@ -17,7 +17,7 @@ pkgdata_PYTHON = \ ImportXml.py pkgpyexecdir = @pkgpyexecdir@/plugins/import -pkgpythondir = @pkgpythondir@/plugins/import +pkgpythondir = $(datadir)/@PACKAGE@/plugins/import GLADEFILES = \ importgedcom.glade @@ -35,4 +35,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/lib/Makefile.am b/src/plugins/lib/Makefile.am index a931cf1e9..158bddb4b 100644 --- a/src/plugins/lib/Makefile.am +++ b/src/plugins/lib/Makefile.am @@ -14,7 +14,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/lib SUBDIRS = maps -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ libcairodoc.py\ libformatting.py\ libgedcom.py\ @@ -36,7 +36,7 @@ pkgdata_PYTHON = \ libtreebase.py pkgpyexecdir = @pkgpyexecdir@/plugins/lib -pkgpythondir = @pkgpythondir@/plugins/lib +pkgpythondir = $(datadir)/@PACKAGE@/plugins/lib GLADEFILES = @@ -57,4 +57,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/lib/maps/Makefile.am b/src/plugins/lib/maps/Makefile.am index 72db2e4ac..b398e061e 100644 --- a/src/plugins/lib/maps/Makefile.am +++ b/src/plugins/lib/maps/Makefile.am @@ -1,13 +1,13 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/lib/maps -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 @@ -16,4 +16,4 @@ GRAMPS_PY_MODPATH = "../../:../view" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/mapservices/Makefile.am b/src/plugins/mapservices/Makefile.am index 6fd40574f..7e6db0c63 100644 --- a/src/plugins/mapservices/Makefile.am +++ b/src/plugins/mapservices/Makefile.am @@ -5,14 +5,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 = @@ -29,4 +29,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/quickview/Makefile.am b/src/plugins/quickview/Makefile.am index 16cd58e99..04daf82cc 100644 --- a/src/plugins/quickview/Makefile.am +++ b/src/plugins/quickview/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/quickview -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ AgeOnDate.py \ all_events.py \ all_relations.py \ @@ -21,7 +21,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 @@ -30,4 +30,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/rel/Makefile.am b/src/plugins/rel/Makefile.am index f5b6cb0e1..9ec501091 100644 --- a/src/plugins/rel/Makefile.am +++ b/src/plugins/rel/Makefile.am @@ -5,8 +5,8 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/rel -pkgdata_PYTHON = \ - relplugins.gpr.py\ +pkgpython_PYTHON = \ + relplugins.gpr.py\ rel_ca.py\ rel_cs.py\ rel_da.py\ @@ -14,7 +14,7 @@ pkgdata_PYTHON = \ rel_es.py\ rel_fi.py\ rel_fr.py\ - rel_hu.py\ + rel_hu.py\ rel_hr.py\ rel_it.py\ rel_nl.py\ @@ -22,12 +22,12 @@ pkgdata_PYTHON = \ rel_pl.py\ rel_pt.py\ rel_ru.py\ - rel_sk.py\ + rel_sk.py\ rel_sl.py\ 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 @@ -36,4 +36,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/sidebar/Makefile.am b/src/plugins/sidebar/Makefile.am index 049ffca29..8308ac64d 100644 --- a/src/plugins/sidebar/Makefile.am +++ b/src/plugins/sidebar/Makefile.am @@ -5,12 +5,12 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/sidebar -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ categorysidebar.py\ sidebar.gpr.py pkgpyexecdir = @pkgpyexecdir@/plugins/sidebar -pkgpythondir = @pkgpythondir@/plugins/sidebar +pkgpythondir = $(datadir)/@PACKAGE@/plugins/sidebar # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -19,4 +19,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/textreport/Makefile.am b/src/plugins/textreport/Makefile.am index 0249547d1..3cf4d295a 100644 --- a/src/plugins/textreport/Makefile.am +++ b/src/plugins/textreport/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/textreport -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ AncestorReport.py\ BirthdayReport.py\ CustomBookText.py\ @@ -19,12 +19,12 @@ pkgdata_PYTHON = \ NumberOfAncestorsReport.py\ PlaceReport.py\ SimpleBookTitle.py\ - Summary.py\ + Summary.py\ TagReport.py\ textplugins.gpr.py pkgpyexecdir = @pkgpyexecdir@/plugins/textreport -pkgpythondir = @pkgpythondir@/plugins/textreport +pkgpythondir = $(datadir)/@PACKAGE@/plugins/textreport # 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)); diff --git a/src/plugins/tool/Makefile.am b/src/plugins/tool/Makefile.am index ec1289531..e90b93407 100644 --- a/src/plugins/tool/Makefile.am +++ b/src/plugins/tool/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/tool -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ ChangeNames.py \ ChangeTypes.py \ Check.py \ @@ -34,7 +34,7 @@ pkgdata_PYTHON = \ # TestcaseGenerator.py pkgpyexecdir = @pkgpyexecdir@/plugins/tool -pkgpythondir = @pkgpythondir@/plugins/tool +pkgpythondir = $(datadir)/@PACKAGE@/plugins/tool GLADEFILES = \ changenames.glade \ @@ -63,4 +63,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/view/Makefile.am b/src/plugins/view/Makefile.am index bfa7b61ab..6f08b34ab 100644 --- a/src/plugins/view/Makefile.am +++ b/src/plugins/view/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/view -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ eventview.py \ familyview.py \ fanchartview.gpr.py \ @@ -32,7 +32,7 @@ pkgdata_PYTHON = \ view.gpr.py pkgpyexecdir = @pkgpyexecdir@/plugins/view -pkgpythondir = @pkgpythondir@/plugins/view +pkgpythondir = $(datadir)/@PACKAGE@/plugins/view # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -41,4 +41,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/webreport/Makefile.am b/src/plugins/webreport/Makefile.am index 0b43b6f8e..5d26437ec 100644 --- a/src/plugins/webreport/Makefile.am +++ b/src/plugins/webreport/Makefile.am @@ -5,13 +5,13 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/webreport -pkgdata_PYTHON = \ +pkgpython_PYTHON = \ NarrativeWeb.py\ WebCal.py\ webplugins.gpr.py pkgpyexecdir = @pkgpyexecdir@/plugins/webreport -pkgpythondir = @pkgpythondir@/plugins/webreport +pkgpythondir = $(datadir)/@PACKAGE@/plugins/webreport # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo @@ -20,4 +20,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON)); diff --git a/src/plugins/webstuff/Makefile.am b/src/plugins/webstuff/Makefile.am index 9afb8d42f..d3082cbbe 100644 --- a/src/plugins/webstuff/Makefile.am +++ b/src/plugins/webstuff/Makefile.am @@ -7,12 +7,12 @@ SUBDIRS = css images 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 @@ -21,4 +21,4 @@ GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ - pychecker $(pkgdata_PYTHON)); + pychecker $(pkgpython_PYTHON));