From fa19ecb0d639f053b3c7cf2ae6d7c1e9d6c913ee Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Tue, 27 Jul 2004 14:31:39 +0000 Subject: [PATCH] Another little nit with the metainstalldir handling. metainstalldir=/ would mess things up. --- buildpkg.packaging.irix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buildpkg.packaging.irix b/buildpkg.packaging.irix index a5e4189..44c2963 100644 --- a/buildpkg.packaging.irix +++ b/buildpkg.packaging.irix @@ -440,6 +440,7 @@ create_idb() metaprefix=${metainstalldir##$topinstalldir} metaprefix="${metaprefix#/*}" [ ! -z "$metaprefix" ] && metaprefix="${metaprefix}/" + [ ! "$metainstalldir" == "/" ] && metainstalldir="${metainstalldir}/" if [ -d "${stagedir}${metainstalldir}/src" ]; then # We have a srcdir which means we have patches, so add them to the idb file add_files "${metaprefix}src" opt.src - root sys "" @@ -455,8 +456,8 @@ create_idb() # add_files "dist" opt.dist - root sys "" pc[$pcpos]="opt.dist" # Add entries for the spec & idb files (opt.dist), they will be installed later, after they've actually been created - echo "f 644 root sys ${metainstalldir:1}/dist/$topdir-$version-$pkgver/$topdir.idb ${metaprefix}dist/$topdir-$version-$pkgver/$topdir.idb ${pkgname}.opt.dist" >>$idbfile - echo "f 644 root sys ${metainstalldir:1}/dist/$topdir-$version-$pkgver/$topdir.spec ${metaprefix}dist/$topdir-$version-$pkgver/$topdir.spec ${pkgname}.opt.dist" >>$idbfile + echo "f 644 root sys ${metainstalldir:1}dist/$topdir-$version-$pkgver/$topdir.idb ${metaprefix}dist/$topdir-$version-$pkgver/$topdir.idb ${pkgname}.opt.dist" >>$idbfile + echo "f 644 root sys ${metainstalldir:1}dist/$topdir-$version-$pkgver/$topdir.spec ${metaprefix}dist/$topdir-$version-$pkgver/$topdir.spec ${pkgname}.opt.dist" >>$idbfile echo "${metaprefix}dist/$topdir-$version-$pkgver/$topdir.idb" >> $metadir/files.tmp echo "${metaprefix}dist/$topdir-$version-$pkgver/$topdir.spec" >> $metadir/files.tmp # fi