Template update

svn: r1602

gramps2/src/Makefile.in

@@ -260,7 +260,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	install-exec-recursive installdirs-recursive install-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README $(dist_pkgdata_DATA) $(pkgpython_PYTHON) AUTHORS \
-	ChangeLog Makefile.am Makefile.in NEWS TODO const.py.in
+	ChangeLog Makefile.am Makefile.in NEWS const.py.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 

gramps2/src/calendars/Makefile.in

@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# This is the src/plugins level Makefile for Gramps
+# This is the src/calendars level Makefile for Gramps
 # Use GNU make's ':=' syntax for nice wildcard use.
 # If not using GNU make, then list all .py files individually
 SHELL = @SHELL@
@@ -67,7 +67,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-pkgdatadir = ${datadir}/@PACKAGE@/calendars
+pkgdatadir = $(datadir)/@PACKAGE@/calendars
 AMTAR = @AMTAR@
 AWK = @AWK@
 BINSH = @BINSH@
@@ -118,6 +118,8 @@ pkgpython_PYTHON = \
 	Islamic.py \
 	Persian.py
 
+
+GRAMPS_PY_MODPATH = "../"
 subdir = src/calendars
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -261,6 +263,10 @@ uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON
 	uninstall uninstall-am uninstall-info-am \
 	uninstall-pkgpythonPYTHON
 
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

gramps2/src/data/Makefile.in

@@ -62,7 +62,7 @@ POST_UNINSTALL = :
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgdatadir = ${datadir}/@PACKAGE@/data
+pkgdatadir = $(datadir)/@PACKAGE@/data
 AMTAR = @AMTAR@
 AWK = @AWK@
 BINSH = @BINSH@
@@ -113,7 +113,7 @@ SUBDIRS = templates
 
 pkgdata_DATA = gedcom.xml 
 
-EXTRA_DIST = ${pkgdata_DATA}
+EXTRA_DIST = $(pkgdata_DATA)
 subdir = src/data
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =

gramps2/src/data/templates/Makefile.in

@@ -63,7 +63,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-pkgdatadir = ${datadir}/@PACKAGE@/data/templates
+pkgdatadir = $(datadir)/@PACKAGE@/data/templates
 AMTAR = @AMTAR@
 AWK = @AWK@
 BINSH = @BINSH@
@@ -110,8 +110,13 @@ pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 
 # This is the src/data/templates level Makefile
-pkgdata_DATA := ${wildcard *.tpkg} templates.xml
+pkgdata_DATA = marble.tpkg \
-EXTRA_DIST = ${pkgdata_DATA}
+	     pink_marble.tpkg \
+	     sepia.tpkg \
+	     sky_border.tpkg \
+	     templates.xml
+
+EXTRA_DIST = $(pkgdata_DATA)
 subdir = src/data/templates
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =

gramps2/src/docgen/Makefile.in

@@ -127,6 +127,8 @@ pkgpython_PYTHON = \
 	RTFDoc.py\
 	SvgDrawDoc.py
 
+
+GRAMPS_PY_MODPATH = "../"
 subdir = src/docgen
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -270,6 +272,10 @@ uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON
 	uninstall uninstall-am uninstall-info-am \
 	uninstall-pkgpythonPYTHON
 
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

gramps2/src/filters/Makefile.in

@@ -132,6 +132,8 @@ pkgpython_PYTHON = \
 	RegExMatch.py\
 	SubString.py
 
+
+GRAMPS_PY_MODPATH = "../"
 subdir = src/filters
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -275,6 +277,10 @@ uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON
 	uninstall uninstall-am uninstall-info-am \
 	uninstall-pkgpythonPYTHON
 
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

gramps2/src/plugins/Makefile.in

@@ -13,10 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-# This is the src/plugins level Makefile for Gramps
-# Use GNU make's ':=' syntax for nice wildcard use.
-# If not using GNU make, then list all .py files individually
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -67,7 +63,7 @@ EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-pkgdatadir = ${datadir}/@PACKAGE@/plugins
+pkgdatadir = $(datadir)/@PACKAGE@/plugins
 AMTAR = @AMTAR@
 AWK = @AWK@
 BINSH = @BINSH@
@@ -114,6 +110,10 @@ pkgpythondir = @pkgpythondir@/plugins
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 
+# This is the src/plugins level Makefile for Gramps
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
 pkgpython_PYTHON = \
 	AncestorChart.py\
 	AncestorReport.py\
@@ -127,6 +127,8 @@ pkgpython_PYTHON = \
 	DetDescendantReport.py\
 	EventCmp.py\
 	FamilyGroup.py\
+	FtmStyleAncestors.py\
+	FtmStyleDescendants.py\
 	FilterEditor.py\
 	GraphViz.py\
 	IndivComplete.py\
@@ -134,6 +136,7 @@ pkgpython_PYTHON = \
 	Merge.py\
 	PatchNames.py\
 	ReadGedcom.py\
+	ReadPkg.py\
 	ReadNative.py\
 	RelCalc.py\
 	ReorderIds.py\
@@ -143,7 +146,11 @@ pkgpython_PYTHON = \
 	Verify.py\
 	WebPage.py\
 	WriteGedcom.py\
-	WritePkg.py
+	WritePkg.py\
+	WriteCD.py\
+	rel_ru.py\
+        eval.py\
+	leak.py
 
 
 GLADEFILES = \
@@ -159,17 +166,21 @@ GLADEFILES = \
 	relcalc.glade\
 	soundex.glade\
 	summary.glade\
-	verify.glade
+	verify.glade\
+	cdexport.glade\
+	eval.glade\
+	leak.glade
 
 
-pkgdata_DATA = ${GLADEFILES}
+dist_pkgdata_DATA = $(GLADEFILES)
-dist_pkgdata_DATA = ${pkgdata_DATA} 
+
+GRAMPS_PY_MODPATH = "../:../docgen"
 subdir = src/plugins
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 py_compile = $(top_srcdir)/py-compile
-DATA = $(dist_pkgdata_DATA) $(pkgdata_DATA)
+DATA = $(dist_pkgdata_DATA)
 
 DIST_COMMON = $(dist_pkgdata_DATA) $(pkgpython_PYTHON) Makefile.am \
 	Makefile.in
@@ -222,24 +233,6 @@ uninstall-dist_pkgdataDATA:
 	  echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
 	  rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
 	done
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
-install-pkgdataDATA: $(pkgdata_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-	@list='$(pkgdata_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
-	  $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
-	done
-
-uninstall-pkgdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgdata_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
-	  rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
-	done
 tags: TAGS
 TAGS:
 
@@ -274,7 +267,7 @@ check: check-am
 all-am: Makefile $(DATA)
 
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(pkgpythondir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkgdatadir)
+	$(mkinstalldirs) $(DESTDIR)$(pkgpythondir) $(DESTDIR)$(pkgdatadir)
 
 install: install-am
 install-exec: install-exec-am
@@ -316,8 +309,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_pkgdataDATA install-pkgdataDATA \
+install-data-am: install-dist_pkgdataDATA install-pkgpythonPYTHON
-	install-pkgpythonPYTHON
 
 install-exec-am:
 
@@ -336,20 +328,23 @@ mostlyclean: mostlyclean-am
 mostlyclean-am: mostlyclean-generic
 
 uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am \
-	uninstall-pkgdataDATA uninstall-pkgpythonPYTHON
+	uninstall-pkgpythonPYTHON
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am info info-am install \
 	install-am install-data install-data-am \
 	install-dist_pkgdataDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-pkgdataDATA \
+	install-info install-info-am install-man \
 	install-pkgpythonPYTHON install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	uninstall uninstall-am uninstall-dist_pkgdataDATA \
-	uninstall-info-am uninstall-pkgdataDATA \
+	uninstall-info-am uninstall-pkgpythonPYTHON
-	uninstall-pkgpythonPYTHON
 
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgpython_PYTHON));
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

gramps2/src/po/Makefile.in

@@ -109,8 +109,8 @@ pyexecdir = @pyexecdir@
 pythondir = @pythondir@
 
 # This is the src/po level Makefile configuration
-EXTRA_DIST = ${POFILES}
+EXTRA_DIST = $(POFILES) template.po
-CLEANFILES = ${MOFILES}
+CLEANFILES = $(MOFILES)
 
 SUFFIXES = .po .mo
 subdir = src/po
@@ -159,7 +159,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile all-local
 
 installdirs:
 
@@ -224,32 +224,32 @@ mostlyclean-am: mostlyclean-generic
 
 uninstall-am: uninstall-info-am uninstall-local
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
+.PHONY: all all-am all-local check check-am clean clean-generic \
-	distclean-generic distdir dvi dvi-am info info-am install \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
-	install-am install-data install-data-am install-data-local \
+	install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
+	install-data-local install-exec install-exec-am install-info \
-	install-man install-strip installcheck installcheck-am \
+	install-info-am install-man install-strip installcheck \
-	installdirs maintainer-clean maintainer-clean-generic \
+	installcheck-am installdirs maintainer-clean \
-	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall-info-am uninstall-local
+	uninstall uninstall-am uninstall-info-am uninstall-local
 
 
-all: ${MOFILES}
+all-local: $(MOFILES)
 
-install-data-local:
+install-data-local: 
-	for lang in ${LANGUAGES}; do \
+	for lang in $(LANGUAGES); do \
-	   ${INSTALL} -d ${prefix}/share/locale/$$lang; \
+	   $(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$lang; \
-	   ${INSTALL} -d ${prefix}/share/locale/$$lang/LC_MESSAGES; \
+	   $(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES; \
-	   ${INSTALL_DATA} $$lang.mo ${prefix}/share/locale/$$lang/LC_MESSAGES/${PACKAGE}.mo; \
+	   $(INSTALL_DATA) $$lang.mo $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
 	done	
 
 uninstall-local:
-	for lang in ${LANGUAGES}; do \
+	for lang in $(LANGUAGES); do \
-	   rm -f ${prefix}/share/locale/$$lang/LC_MESSAGES/gramps.mo; \
+	   rm -f $(DESTDIR)$(prefix)/share/locale/$$lang/LC_MESSAGES/gramps.mo; \
 	done
 
 .po.mo:
-	${MSGFMT} -v $< -o $@
+	$(MSGFMT) -v $< -o $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

gramps2/src/po/template.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GRAMPS VERSION\n"
-"POT-Creation-Date: Tue May 27 12:56:19 2003\n"
+"POT-Creation-Date: Wed May 28 09:54:40 2003\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"