From 6bf86aa119b87738180207db4ac3fb6fa3c87445 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sat, 4 Feb 2006 00:12:32 +0000 Subject: [PATCH] * src/Makefile.am: Remove absent glade files from the list. * src/GrampsDb/Makefile.am: Ship new glade files; correct directory. svn: r5880 --- gramps2/ChangeLog | 3 +++ gramps2/src/GrampsDb/Makefile.am | 12 +++++++++--- gramps2/src/Makefile.am | 2 -- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 7c1282a88..791d6ba96 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -13,6 +13,9 @@ * src/GrampsDb/_*.py: Use new Date, new unserialize. * src/*.py: Use new Date. + * src/Makefile.am: Remove absent glade files from the list. + * src/GrampsDb/Makefile.am: Ship new glade files; correct directory. + 2006-02-03 Richard Taylor * src/TreeViews/_PersonTreeView.py: added more columns diff --git a/gramps2/src/GrampsDb/Makefile.am b/gramps2/src/GrampsDb/Makefile.am index 334bdd618..c91003f8c 100644 --- a/gramps2/src/GrampsDb/Makefile.am +++ b/gramps2/src/GrampsDb/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@/RelLib +pkgdatadir = $(datadir)/@PACKAGE@/GrampsDb pkgdata_PYTHON = \ _GedcomInfo.py\ @@ -24,8 +24,14 @@ pkgdata_PYTHON = \ _WriteXML.py\ _ConstXML.py -pkgpyexecdir = @pkgpyexecdir@/RelLib -pkgpythondir = @pkgpythondir@/RelLib +pkgpyexecdir = @pkgpyexecdir@/GrampsDb +pkgpythondir = @pkgpythondir@/GrampsDb + +GLADEFILES = \ + gedcomimport.glade\ + gedcomexport.glade + +dist_pkgdata_DATA = $(GLADEFILES) GRAMPS_PY_MODPATH = "../" diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am index c304e57a7..a7c0c7f4e 100644 --- a/gramps2/src/Makefile.am +++ b/gramps2/src/Makefile.am @@ -126,8 +126,6 @@ GLADEFILES = \ gramps.glade\ edit_person.glade\ mergedata.glade\ - gedcomexport.glade\ - gedcomimport.glade\ plugins.glade\ rule.glade\ scratchpad.glade