Changeset 1fa0dee for pkgmngt


Ignore:
Timestamp:
01/30/2018 01:53:34 PM (6 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
ablfs-more, legacy, trunk
Children:
5afaf7c
Parents:
2140f22
Message:

Prepend JH_ to exported variables in jhalfs-blfs, so that collision with
build system variables is unlikely

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pkgmngt/packInstall.sh.porg

    r2140f22 r1fa0dee  
    2323    ;;
    2424  icu*) # No version in PCKGVRS! Use version directly from xml book.
    25         # PACK_INSTALL contains the path to this script, which is in the
     25        # JH_PACK_INSTALL contains the path to this script, which is in the
    2626        # parent dir of the book.
    27     local PACKENT=$(dirname $PACK_INSTALL)/blfs-xml/packages.ent
     27    local PACKENT=$(dirname $JH_PACK_INSTALL)/blfs-xml/packages.ent
    2828    local VERSION1=$(sed -n 's/.*icu-major[^0-9]*\([^"]*\).*/\1/p' $PACKENT)
    2929    local VERSION2=$(sed -n 's/.*icu-minor[^0-9]*\([^"]*\).*/\1/p' $PACKENT)
     
    3131    ;;
    3232  exiv*)
    33     local PACKENT=$(dirname $PACK_INSTALL)/blfs-xml/packages.ent
     33    local PACKENT=$(dirname $JH_PACK_INSTALL)/blfs-xml/packages.ent
    3434    VERSION=$(sed -n 's/.*exiv2[^0-9]*\([^"]*\).*/\1/p' $PACKENT)
    3535    ;;
    3636  flashplayer*)
    37     local PACKENT=$(dirname $PACK_INSTALL)/blfs-xml/packages.ent
     37    local PACKENT=$(dirname $JH_PACK_INSTALL)/blfs-xml/packages.ent
    3838    VERSION=$(sed -n 's/.*flashplayer[^0-9]*\([^"]*\).*/\1/p' $PACKENT)
    3939    ;;
    4040  soundtouch*)
    41     local PACKENT=$(dirname $PACK_INSTALL)/blfs-xml/packages.ent
     41    local PACKENT=$(dirname $JH_PACK_INSTALL)/blfs-xml/packages.ent
    4242    VERSION=$(sed -n 's/.*soundtouch[^0-9]*\([^"]*\).*/\1/p' $PACKENT)
    4343    ;;
    4444  xvid*)
    45     local PACKENT=$(dirname $PACK_INSTALL)/blfs-xml/packages.ent
     45    local PACKENT=$(dirname $JH_PACK_INSTALL)/blfs-xml/packages.ent
    4646    VERSION=$(sed -n 's/.*xvid[^0-9]*\([^"]*\).*/\1/p' $PACKENT)
    4747    ;;
    4848  xf86-video-intel)
    49     local PACKENT=$(dirname $PACK_INSTALL)/blfs-xml/x/installing/x7driver-intel.xml
     49    local PACKENT=$(dirname $JH_PACK_INSTALL)/blfs-xml/x/installing/x7driver-intel.xml
    5050    VERSION=$(sed -n '/<!--/!s/.*-version[^;][^0-9]*\([^"]*\).*/\1/p' $PACKENT)
    5151    ;;
Note: See TracChangeset for help on using the changeset viewer.