[GRASS-dev] Re: [GRASS-CVS] glynn: grass6/lib/init Makefile, 1.45, 1.46

[Maciej Sieczka]

Glynn Clements wrote:
> Maciej Sieczka wrote:

>> grass at intevation.de wrote:
>>> Author: glynn
>>>
>>> Update of /grassrepository/grass6/lib/init
>>> In directory doto:/tmp/cvs-serv30602/lib/init
>>>
>>> Modified Files:
>>> 	Makefile 
>>> Log Message:
>>> Only install .bat files on Windows
>> Glynn
>>
>> On my Ubuntu, $GISBASE/etc/grass-run.bat and
>> $GISBASE/etc/Init.bat indeed don't get installed after your fix.
>>
>> But $GISBASE/etc/nviz.bat and /usr/local/bin/grass63.bat
>> still do, only the latter is empty now.

> The fix only applies to lib/init; NVIZ wasn't touched.
> 
> grass63.bat doesn't get installed into dist.<arch>, but the top-level
> Makefile still tries to process it:
> 
> 	-sed -e "s#WINGISBASE=.*#WINGISBASE=${INST_DIR}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.bat > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.bat
> 
> Try this:
> 
> --- Makefile	2 Oct 2007 17:46:31 -0000	1.132
> +++ Makefile	16 Oct 2007 19:46:05 -0000
> @@ -252,8 +252,10 @@
>  	test -d ${BINDIR} || ${MAKE_DIR_CMD} ${BINDIR}
>  	-sed -e "s#^GISBASE.*#GISBASE=${INST_DIR}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
>  	-chmod a+x ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
> +ifneq ($(strip $(MINGW32)),)
>  	-sed -e "s#WINGISBASE=.*#WINGISBASE=${INST_DIR}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.bat > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.bat
>  	-chmod a+x ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}.bat
> +endif
>  	-cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
>  	-cd ${GISBASE} ; tar cBf - bwidget | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
>  	-cd ${GISBASE} ; tar cBf - docs | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null

Works for me. /usr/local/bin/grass63.bat don't get installed.

Maciek