diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-02-29 15:59:47 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-02-29 15:59:47 +0000 |
| commit | d8618d0ce0ee1bf7ad72efac9cbf5626a2897698 (patch) | |
| tree | fc29126a2695526378cef852bc57bf7b6d219df5 /packages/mono | |
| parent | 5a362b4bb805986fbb4a5e0aee08d23b62d84b05 (diff) | |
| parent | 5e33f4db5f153d6b3e3cc9c75523e9ce9288e396 (diff) | |
merge of '7ebcf65940382b7ebea258189704cb0e4a77dc70'
and 'ae9980c1d055e682beb2fea6cfddb080c495b43b'
Diffstat (limited to 'packages/mono')
| -rw-r--r-- | packages/mono/README | 2 | ||||
| -rw-r--r-- | packages/mono/mono-mcs-intermediate.inc | 4 | ||||
| -rw-r--r-- | packages/mono/mono_1.2.5.1.bb | 2 | ||||
| -rw-r--r-- | packages/mono/mono_1.2.6.bb | 2 | ||||
| -rw-r--r-- | packages/mono/mono_svn.bb | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/packages/mono/README b/packages/mono/README index eb2fed051f..61bba80c07 100644 --- a/packages/mono/README +++ b/packages/mono/README @@ -28,6 +28,6 @@ This function calls mono_find_provides_and_requires which finds out (through calls to monodis --assembly and monodis --assemblyref) which assemblies are provided and required by a particular package. mono_do_clilibs then puts the information about provided assemblies into -${STAGING_DIR}/clilibs/${packagename}.list and information about the +${CLILIBSDIR}/${packagename}.list and information about the required packages into ${PKGDEST}/{packagename}.clilibdeps where it will later be picked up by read_shlibdeps. diff --git a/packages/mono/mono-mcs-intermediate.inc b/packages/mono/mono-mcs-intermediate.inc index db74b96ee3..f6631c1eb1 100644 --- a/packages/mono/mono-mcs-intermediate.inc +++ b/packages/mono/mono-mcs-intermediate.inc @@ -47,8 +47,8 @@ do_populate_staging() { cd ${D} rm -f ${WORKDIR}/mono-mcs-${PV}.tar.gz tar -cvzf ${WORKDIR}/mono-mcs-${PV}.tar.gz . - install -d ${STAGING_DIR}/share/mono-mcs - cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DIR}/share/mono-mcs/ + install -d ${STAGING_DATADIR}/mono-mcs + cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DATADIR}/mono-mcs/ } do_package_write_ipk() { diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb index 1d58c2d810..a9bf2f8e1e 100644 --- a/packages/mono/mono_1.2.5.1.bb +++ b/packages/mono/mono_1.2.5.1.bb @@ -14,7 +14,7 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} pushd ${D} - tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz popd } diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb index 5c5d8476bb..a5359125a9 100644 --- a/packages/mono/mono_1.2.6.bb +++ b/packages/mono/mono_1.2.6.bb @@ -13,7 +13,7 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} pushd ${D} - tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz popd } diff --git a/packages/mono/mono_svn.bb b/packages/mono/mono_svn.bb index 6644efb4e3..53d0fb0d30 100644 --- a/packages/mono/mono_svn.bb +++ b/packages/mono/mono_svn.bb @@ -14,7 +14,7 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} pushd ${D} - tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz popd } |