• Bug#264236: Updated patch

    From Jurij Smakov@1:229/2 to All on Fri Aug 13 10:40:07 2004
    From: [email protected]

    tags 264236 + patch
    thanks

    Hello again,

    Here's the patch which seems to do The Right Thing (tm). Since attempts to change syntax to make it both bash and dash compatible have failed (see
    above), the solution is to set SHELL=/bin/bash in the relevant Makefile.
    Note that it is pretty tricky to pass the SHELL variable to sub-make
    without using ugly tricks, and the file in question requires modification anyway (to replace 'head -1' with 'head -n 1'). The package builds fine
    with both dash and bash as /bin/sh with this patch applied.

    --------------------------------cut here---------------------------------
    diff -aur endeavour-2.3.2_orig/endeavour2/makefile_append.ini endeavour-2.3.2/endeavour2/makefile_append.ini
    --- endeavour-2.3.2_orig/endeavour2/makefile_append.ini 2004-08-12 23:03:31.000000000 -0400
    +++ endeavour-2.3.2/endeavour2/makefile_append.ini 2004-08-12 23:03:19.000000000 -0400
    @@ -1,6 +1,6 @@
    # Appended stuff starts here
    #
    -
    +SHELL=/bin/bash
    # C++ flags:
    CPPFLAGS = -D__cplusplus -Dc_plusplus

    @@ -28,7 +28,7 @@
    EXPORT_COMPILETIMEINFO_H = echo -n -e "\
    \#ifndef COMPILETIMEINFO_H\n\
    \#define COMPILETIMEINFO_H\n\
    -\#define COMPILE_COMPILER\t\"`$(CPP) --version | head -1`\"\n\
    +\#define COMPILE_COMPILER\t\"`$(CPP) --version | head -n 1`\"\n\
    \#define COMPILE_USER\t\t\"$(USER)\"\n\
    \#define COMPILE_LOCATION\t\"`uname -n`\"\n\
    \#define COMPILE_DATE\t\t`date +\"%s\"`\n\
    --------------------------------cut here---------------------------------

    Best regards,

    Jurij Smakov [email protected]
    Key: http://www.wooyd.org/pgpkey/ KeyID: C99E03CC


    --
    To UNSUBSCRIBE, email to [email protected]
    with a subjec