#620: Platform.make odd variables settings
--------------------------+-------------------------------------------------
Reporter: frankie | Owner: grass-...@…
Type: defect | Status: new
Priority: normal | Milestone: 6.4.1
Component: Installation | Version: 6.4.0 RCs
Keywords: g.extension | Platform: Linux
Cpu: Unspecified |
--------------------------+-------------------------------------------------
Comment(by hamish):
hopefully now fixed for 'make install' in 6.5svn. some calls to sed in the
`install` target in the Makefile now replace the build dir with the
install dir as part of the install process.
if distro package install scripts are not using 'make install' they'll
have to recreate this step themselves.
combined patch for 6.4svn from r43737, r43748, r43749, r43811:
{{{
Index: Makefile
===================================================================
--- Makefile (revision 43826)
+++ Makefile (working copy)
@@ -95,6 +95,7 @@
-cp -f $(FILES) ${ARCH_DISTDIR}/
-cp -f
${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
${ARCH_DISTDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.tmp
@test -d ${ARCH_DISTDIR}/tools/ || mkdir -p ${ARCH_DISTDIR}/tools/
+ -${INSTALL} tools/g.html2man/g.html2man ${ARCH_DISTDIR}/tools/
2>/dev/null
-${INSTALL} tools/mkhtml.sh ${ARCH_DISTDIR}/tools/ 2>/dev/null
@(cd tools ; sh -c "./build_html_index.sh")
@if [ `cat "$(ERRORLOG)" | wc -l` -gt 5 ] ; then \
@@ -288,6 +289,8 @@
@ # default to be /usr/local
@##### -cd ${GISBASE} ; tar cBf - man | (cd ${INST_DIR} ; tar xBf
- ) 2>/dev/null
-cd ${GISBASE} ; tar cBf - include | (cd ${INST_DIR} ; tar xBf - )
2>/dev/null
+ -sed -i -e "s#^\(GRASS_HOME.[^=]*\).*#\1= ${INST_DIR}#" -e
"s#^\(RUN_GISBASE.[^=]*\).*#\1= ${INST_DIR}#"
${INST_DIR}/include/Make/Platform.make
+ -sed -i -e 's#/tools/g.html2man/g.html2man#/tools/g.html2man#'
${INST_DIR}/include/Make/Man.make
-cd ${GISBASE} ; tar cBf - lib | (cd ${INST_DIR} ; tar xBf - )
2>/dev/null
-sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/monitorcap >
${INST_DIR}/etc/monitorcap
-sed 's#'${GISBASE}'#'${INST_DIR}'#g' ${GISBASE}/etc/fontcap >
${INST_DIR}/etc/fontcap
}}}
Hamish
--
Ticket URL: <http://trac.osgeo.org/grass/ticket/620#comment:17>
GRASS GIS <http://grass.osgeo.org>
_______________________________________________
grass-dev mailing list
[email protected]
http://lists.osgeo.org/mailman/listinfo/grass-dev
