[GRASS5] Re: [GRASS-CVS] markus: grass Makefile.in,1.94,1.95

GRASS GRASS developer
1

Hi Markus,

seems to me this is excessive to create "locale"
directory if it was missing (actually, it would always
be missing). tar xBf would copy the entire "locale"
directory to $INST_DIR in case it happened to occur in
$GISBASE after gmake5 works in src/locale. This was
tested more then once.

--alex

--- grass@intevation.de wrote:

Author: markus

Update of /grassrepository/grass
In directory doto:/tmp/cvs-serv2512

Modified Files:
  Makefile.in
Log Message:
bugfix for creating locale directory in INST_DIR -
was missing

Index: Makefile.in

===================================================================

RCS file: /grassrepository/grass/Makefile.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- Makefile.in 10 May 2002 12:46:33 -0000 1.94
+++ Makefile.in 15 May 2002 08:30:55 -0000 1.95
@@ -184,6 +184,7 @@
   ${SHELL} -c "cd ${GISBASE} ; tar cBf - scripts |
(cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; true"
   ${SHELL} -c "cd ${GISBASE} ; tar cBf - tcltkgrass
| (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; true"
   ${SHELL} -c "cd ${GISBASE} ; tar cBf - txt | (cd
${INST_DIR} ; tar xBf - ) 2>/dev/null ; true"
+ test -d ${GISBASE}/locale && test -d
${INST_DIR}/locale || ${MAKE_DIR_CMD}
${INST_DIR}/locale
   test -d ${GISBASE}/locale && ${SHELL} -c "cd
${GISBASE} ; tar cBf - locale | (cd ${INST_DIR} ;
tar xBf - ) 2>/dev/null ; true"
   @ # The man, include, and lib could go to
${PREFIX}/ BUT if this is
   @ # done, then the corresponding uninstall
instructions must delete

_______________________________________________
grass-commit mailing list
grass-commit@grass.itc.it
http://grass.itc.it/mailman/listinfo/grass-commit

__________________________________________________
Do You Yahoo!?
LAUNCH - Your Yahoo! Music Experience
http://launch.yahoo.com

2

On Wed, May 15, 2002 at 03:16:45AM -0700, Alex Shevlakov wrote:

Hi Markus,

seems to me this is excessive to create "locale"
directory if it was missing (actually, it would always
be missing). tar xBf would copy the entire "locale"
directory to $INST_DIR in case it happened to occur in
$GISBASE after gmake5 works in src/locale. This was
tested more then once.

Hi Alex,

here the tar command crashed... maybe this function is not
fully portable?

test -d /usr/local/src/grass5.0.0pre4/dist.i686-pc-linux-gnu/locale &&
/bin/sh -c "cd /usr/local/src/grass5.0.0pre4/dist.i686-pc-linux-gnu ;
tar cBf - locale | (cd /usr/local/grass5 ; tar xBf - ) 2>/dev/null ;
true"
make[1]: *** [real-install] Error 1
make[1]: Leaving directory /usr/local/src/grass5.0.0pre4'
make: *** [install] Error 2

That's why I was adding it.

Markus

--alex

--- grass@intevation.de wrote:
> Author: markus
>
> Update of /grassrepository/grass
> In directory doto:/tmp/cvs-serv2512
>
> Modified Files:
> Makefile.in
> Log Message:
> bugfix for creating locale directory in INST_DIR -
> was missing
>
> Index: Makefile.in
>

> RCS file: /grassrepository/grass/Makefile.in,v
> retrieving revision 1.94
> retrieving revision 1.95
> diff -u -d -r1.94 -r1.95
> --- Makefile.in 10 May 2002 12:46:33 -0000 1.94
> +++ Makefile.in 15 May 2002 08:30:55 -0000 1.95
> @@ -184,6 +184,7 @@
> ${SHELL} -c "cd ${GISBASE} ; tar cBf - scripts |
> (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; true"
> ${SHELL} -c "cd ${GISBASE} ; tar cBf - tcltkgrass
> | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null ; true"
> ${SHELL} -c "cd ${GISBASE} ; tar cBf - txt | (cd
> ${INST_DIR} ; tar xBf - ) 2>/dev/null ; true"
> + test -d ${GISBASE}/locale && test -d
> ${INST_DIR}/locale || ${MAKE_DIR_CMD}
> ${INST_DIR}/locale
> test -d ${GISBASE}/locale && ${SHELL} -c "cd
> ${GISBASE} ; tar cBf - locale | (cd ${INST_DIR} ;
> tar xBf - ) 2>/dev/null ; true"
> @ # The man, include, and lib could go to
> ${PREFIX}/ BUT if this is
> @ # done, then the corresponding uninstall
> instructions must delete
>
>
> _______________________________________________
> grass-commit mailing list
> grass-commit@grass.itc.it
> http://grass.itc.it/mailman/listinfo/grass-commit

__________________________________________________
Do You Yahoo!?
LAUNCH - Your Yahoo! Music Experience
http://launch.yahoo.com
_______________________________________________
grass5 mailing list
grass5@grass.itc.it
http://grass.itc.it/mailman/listinfo/grass5

--
Markus Neteler

ITC-irst, Istituto per la Ricerca Scientifica e Tecnologica
     Project on Predictive Models for the Environment
Via Sommarive, 18 - 38050 Povo (Trento), Italia
tel +39 0461 314 -520 (fax -591) http://mpa.itc.it