Changeset caee4df for jhalfs


Ignore:
Timestamp:
08/09/2017 02:06:53 PM (7 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
2.4
Children:
8d07ea6
Parents:
b99e56a
Message:

Merge trunk r3990

File:
1 edited

Legend:

Unmodified
Added
Removed

  • jhalfs

    rb99e56a rcaee4df  
    174174        LFSVRS=${BRANCH_ID}
    175175        TREE=branches/${BRANCH_ID#branch-}
    176         if [ ${BRANCH_ID#branch-} = 6 ]; then
     176        if [ ${BRANCH_ID:7:1} = 6 ]; then
    177177            TREE=${TREE}/BOOK
    178178        fi
    … …  
    293293                     echo " Please rerun make and fix the configuration."
    294294                     exit 2 ;;
    295    branch-systemd )  BLFS_TREE=branches/systemd ;;
    296          branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
    297        6.2* | 7.* )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
     295       branch-6.* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
     296         branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
     297  6.2* | 7.* | 8.*)  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
    298298                * )  BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
    299299    esac
Note: See TracChangeset for help on using the changeset viewer.