From 7af735c6cf4680b77f95906e264e7b4b6f5c1288 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Wed, 6 Oct 2004 19:16:26 +0000
Subject: [PATCH] * src/Makefile.am: Remove extra DESTDIR. *
 src/docgen/Makefile.am: Remove extra DESTDIR, correct pycheck target. *
 src/plugins/Makefile.am: Correct pycheck target.

svn: r3600
---
 ChangeLog               | 5 +++++
 src/Makefile.am         | 2 +-
 src/docgen/Makefile.am  | 4 ++--
 src/plugins/Makefile.am | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c76f1e9a8..a850dc509 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-06 Alex Roitman  <shura@alex.neuro.umn.edu>
+	* src/Makefile.am: Remove extra DESTDIR.
+	* src/docgen/Makefile.am: Remove extra DESTDIR, correct pycheck target.
+	* src/plugins/Makefile.am: Correct pycheck target.
+
 2004-10-05  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/docgen/PdfDoc.py: fixed register_book_doc call
 	* src/AddrEdit.py: pychecker fixes
diff --git a/src/Makefile.am b/src/Makefile.am
index cc03ec239..4315d550b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ MOSTLYCLEANFILES =
 # In principle, this is handled by PYCFILES and PYOFILES, but
 # they don't seem to work so we edited the py-compile script instead
 
-gdirdir=$(DESTDIR)$(prefix)/share/gramps
+gdirdir=$(prefix)/share/gramps
 
 gdir_PYTHON = \
 	accent.py \
diff --git a/src/docgen/Makefile.am b/src/docgen/Makefile.am
index 5255b2ddb..0a64aaa15 100644
--- a/src/docgen/Makefile.am
+++ b/src/docgen/Makefile.am
@@ -2,7 +2,7 @@
 # Use GNU make's ':=' syntax for nice wildcard use.
 # If not using GNU make, then list all .py files individually
 
-docgendir=$(DESTDIR)$(prefix)/share/gramps/docgen
+docgendir=$(prefix)/share/gramps/docgen
 
 docgen_PYTHON = \
 	AbiWord2Doc.py\
@@ -22,4 +22,4 @@ GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgpython_PYTHON));
+	pychecker $(docgen_PYTHON));
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 7197f30b8..1d72cbc83 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -86,4 +86,4 @@ GRAMPS_PY_MODPATH = "../:../docgen"
 
 pycheck: 
 	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
-	pychecker $(pkgpython_PYTHON));
+	pychecker $(pkgdata_PYTHON));