From aa0a835330c78c1f429f988aecdc39923771bc77 Mon Sep 17 00:00:00 2001 From: Martin Hawlisch Date: Sun, 4 Nov 2007 20:41:12 +0000 Subject: [PATCH] * src/gen/lib/Makefile.am, src/gen/db/Makefile.am, src/gen/proxy/Makefile.am, src/gen/utils/Makefile.am: Fix path structure svn: r9295 --- ChangeLog | 6 ++++++ src/gen/db/Makefile.am | 8 ++++---- src/gen/lib/Makefile.am | 8 ++++---- src/gen/proxy/Makefile.am | 6 +++--- src/gen/utils/Makefile.am | 8 ++++---- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06cb43e59..84d491db7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-04 Martin Hawlisch + * src/gen/lib/Makefile.am + * src/gen/db/Makefile.am + * src/gen/proxy/Makefile.am + * src/gen/utils/Makefile.am: Fix path structure + 2007-11-03 Stéphane Charette * src/plugins/NarrativeWeb.py: resize and link to large images diff --git a/src/gen/db/Makefile.am b/src/gen/db/Makefile.am index f95272082..2253997f8 100644 --- a/src/gen/db/Makefile.am +++ b/src/gen/db/Makefile.am @@ -3,7 +3,7 @@ # but that is not necessarily portable. # If not using GNU make, then list all .py files individually -pkgdatadir = $(datadir)/@PACKAGE@/db +pkgdatadir = $(datadir)/@PACKAGE@/gen/db pkgdata_PYTHON = \ __init__.py\ @@ -14,14 +14,14 @@ pkgdata_PYTHON = \ exceptions.py \ iterator.py -pkgpyexecdir = @pkgpyexecdir@/db -pkgpythondir = @pkgpythondir@/db +pkgpyexecdir = @pkgpyexecdir@/gen/db +pkgpythondir = @pkgpythondir@/gen/db # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../" +GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/gen/lib/Makefile.am b/src/gen/lib/Makefile.am index 1468f857a..292138b93 100644 --- a/src/gen/lib/Makefile.am +++ b/src/gen/lib/Makefile.am @@ -3,7 +3,7 @@ # but that is not necessarily portable. # If not using GNU make, then list all .py files individually -pkgdatadir = $(datadir)/@PACKAGE@/lib +pkgdatadir = $(datadir)/@PACKAGE@/gen/lib pkgdata_PYTHON = \ addressbase.py \ @@ -62,13 +62,13 @@ pkgdata_PYTHON = \ urltype.py \ witness.py -pkgpyexecdir = @pkgpyexecdir@/lib -pkgpythondir = @pkgpythondir@/lib +pkgpyexecdir = @pkgpyexecdir@/gen/lib +pkgpythondir = @pkgpythondir@/gen/lib # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../" +GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \ diff --git a/src/gen/proxy/Makefile.am b/src/gen/proxy/Makefile.am index e00c05107..0f48601c0 100644 --- a/src/gen/proxy/Makefile.am +++ b/src/gen/proxy/Makefile.am @@ -3,7 +3,7 @@ # but that is not necessarily portable. # If not using GNU make, then list all .py files individually -pkgdatadir = $(datadir)/@PACKAGE@/proxy +pkgdatadir = $(datadir)/@PACKAGE@/gen/proxy pkgdata_PYTHON = \ __init__.py \ @@ -13,8 +13,8 @@ pkgdata_PYTHON = \ private.py \ proxybase.py -pkgpyexecdir = @pkgpyexecdir@/gen -pkgpythondir = @pkgpythondir@/gen +pkgpyexecdir = @pkgpyexecdir@/gen/proxy +pkgpythondir = @pkgpythondir@/gen/proxy # Clean up all the byte-compiled files diff --git a/src/gen/utils/Makefile.am b/src/gen/utils/Makefile.am index 3fb194880..6540c6021 100644 --- a/src/gen/utils/Makefile.am +++ b/src/gen/utils/Makefile.am @@ -3,7 +3,7 @@ # but that is not necessarily portable. # If not using GNU make, then list all .py files individually -pkgdatadir = $(datadir)/@PACKAGE@/utils +pkgdatadir = $(datadir)/@PACKAGE@/gen/utils pkgdata_PYTHON = \ __init__.py \ @@ -12,14 +12,14 @@ pkgdata_PYTHON = \ progressmon.py \ longop.py -pkgpyexecdir = @pkgpyexecdir@/utils -pkgpythondir = @pkgpythondir@/utils +pkgpyexecdir = @pkgpyexecdir@/gen/utils +pkgpythondir = @pkgpythondir@/gen/utils # Clean up all the byte-compiled files MOSTLYCLEANFILES = *pyc *pyo -GRAMPS_PY_MODPATH = "../" +GRAMPS_PY_MODPATH = "../../" pycheck: (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \