Changeset 1879


Ignore:
Timestamp:
Nov 28, 2010 3:36:14 PM (10 years ago)
Author:
stefan
Message:

setup also DATA_INSTALLED variable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r1878 r1879  
    41044104# proj.pc file is parsed for compiler and linker flags, if available in the
    41054105# same directory.
     4106# Similar, a variable PACKAGE_DATA_INSTALLED is setup to the content of datadir
     4107# of the first .pc file that is parsed.
    41064108#
    41074109# If .pc files for all projects in $2 and their dependencies is found,
     
    41304132m4_toupper($1_CFLAGS_INSTALLED)=
    41314133m4_toupper($1_DATA)=
     4134m4_toupper($1_DATA_INSTALLED)=
    41324135
    41334136# initial list of dependencies is "$2", but we need to filter out version number specifications (= x, <= x, >= x)
     
    41714174      projtoprocess=${projtoprocess/$proj/$projrequires}
    41724175
    4173       # read DATA from $pcfile, if this is the first .pc file we are processing (so assume that its the main one)
    4174       if test "x$allproj" = x ; then
    4175         m4_toupper($1_DATA)=`sed -n -e 's/datadir=//gp' "$pcfile"`
     4176      # read DATA from $pcfile, if _DATA is still empty
     4177      if test "x$m4_toupper($1_DATA)" = x ; then
     4178        projdatadir=
     4179        [pcfilemod=`sed -e '/[a-zA-Z]:/d' -e 's/datadir=\(.*\)/echo projdatadir=\\\\"\1\\\\"/g' $pcfile`]
     4180        eval `sh -c "$pcfilemod"`
     4181        m4_toupper($1_DATA)="$projdatadir"
    41764182      fi
    41774183
     
    41874193    if test "x$pcifile" != x ; then
    41884194      allpcifiles="$pcifile:$allpcifiles"
     4195     
     4196      # read DATA_INSTALLED from $pcifile, if _DATA_INSTALLED is still empty
     4197      if test "x$m4_toupper($1_DATA_INSTALLED)" = x ; then
     4198        projdatadir=
     4199        [pcifilemod=`sed -e '/[a-zA-Z]:/d' -e 's/datadir=\(.*\)/echo projdatadir=\\\\"\1\\\\"/g' $pcifile`]
     4200        eval `sh -c "$pcifilemod"`
     4201        m4_toupper($1_DATA_INSTALLED)="$projdatadir"
     4202      fi
     4203     
    41894204    fi
    41904205
     
    42954310    AC_SUBST(m4_toupper(myvar)_LIBS_INSTALLED)
    42964311  ])
     4312  AC_SUBST(m4_toupper($1)_DATA_INSTALLED)
    42974313
    42984314  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
     
    43114327    if test -n "$m4_toupper($1)_LIBS_INSTALLED" ; then
    43124328      AC_MSG_NOTICE([$1 LIBS_INSTALLED   are $m4_toupper($1)_LIBS_INSTALLED])
     4329    fi
     4330    if test -n "$m4_toupper($1)_DATA_INSTALLED" ; then
     4331      AC_MSG_NOTICE([$1 DATA_INSTALLED   is  $m4_toupper($1)_DATA_INSTALLED])
    43134332    fi
    43144333    coin_foreach_w([myvar], [$3], [
Note: See TracChangeset for help on using the changeset viewer.