Changing docs installation dir

svn: r1416

Makefile.am

@@ -6,8 +6,6 @@ EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS
 
 bin_SCRIPTS = gramps
 
-grampsdocdir = $(datadir)/doc/gramps-$(VERSION)
-
 gramps: gramps.sh
 	cp gramps.sh gramps
 

Makefile.in

@@ -115,8 +115,6 @@ SUBDIRS = src doc omf-install example
 EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS
 
 bin_SCRIPTS = gramps
-
-grampsdocdir = $(datadir)/doc/gramps-$(VERSION)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -468,6 +466,8 @@ uninstall-info: uninstall-info-recursive
 	uninstall-info-recursive uninstall-local uninstall-recursive
 
 
+#grampsdocdir = $(datadir)/doc/gramps-$(VERSION)
+
 gramps: gramps.sh
 	cp gramps.sh gramps
 

aclocal.m4

@@ -809,7 +809,9 @@ AC_DEFUN([AM_PATH_PYTHON],
   m4_if([$1],[],[
     dnl No version check is needed.
     # Find any Python interpreter.
-    AC_PATH_PROG([PYTHON], _AM_PYTHON_INTERPRETER_LIST)],[
+    AC_PATH_PROG([PYTHON], _AM_PYTHON_INTERPRETER_LIST)
+    am_display_PYTHON=python
+  ], [
     dnl A version check is needed.
     if test -n "$PYTHON"; then
       # If the user set $PYTHON, use it and don't search something else.
@@ -830,6 +832,7 @@ AC_DEFUN([AM_PATH_PYTHON],
         done])
       # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
       AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
+      am_display_PYTHON=$am_cv_pathless_PYTHON
     fi
   ])
 
@@ -837,7 +840,7 @@ AC_DEFUN([AM_PATH_PYTHON],
   dnl the best way to do this; it's what "site.py" does in the standard
   dnl library.
 
-  AC_CACHE_CHECK([for $am_cv_pathless_PYTHON version], [am_cv_python_version],
+  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
     [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
   AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
 
@@ -852,8 +855,7 @@ AC_DEFUN([AM_PATH_PYTHON],
   dnl At times (like when building shared libraries) you may want
   dnl to know which OS platform Python thinks this is.
 
-  AC_CACHE_CHECK([for $am_cv_pathless_PYTHON platform],
-	         [am_cv_python_platform],
+  AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
     [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
   AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
 

doc/gramps-manual/C/Makefile.in

@@ -178,7 +178,7 @@ entities = legal.xml
 # ************* Begin of section some packagers may need to modify  **************
 # This variable (docdir) specifies where the documents should be installed.
 # This default value should work for most packages.
-docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
+docdir = $(datadir)/@PACKAGE@/gnome/help/@PACKAGE@/$(lang)
 
 # **************  You should not have to edit below this line  *******************
 xml_files = $(entities) $(docname).xml

doc/xmldocs.make

@@ -36,7 +36,7 @@
 # ************* Begin of section some packagers may need to modify  **************
 # This variable (docdir) specifies where the documents should be installed.
 # This default value should work for most packages.
-docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
+docdir = $(datadir)/@PACKAGE@/gnome/help/@PACKAGE@/$(lang)
 
 # **************  You should not have to edit below this line  *******************
 xml_files = $(entities) $(docname).xml

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