From 4a5d68a47ecbc3add0d2d6b5785c31d0acace58d Mon Sep 17 00:00:00 2001 From: Daniel Joseph Barnhart Clark Date: Tue, 3 Oct 2006 12:13:53 +0000 Subject: EncapPackages: Merging changes from branches/private/dclark/encap-0.8.5. Major change is removal of dependancies on libgcc, libstdc++, gettext, and libiconv. git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2368 ce84e21b-d406-0410-9b95-82705330c041 --- encap/src/makeself-dist/makedist.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'encap/src/makeself-dist/makedist.sh') diff --git a/encap/src/makeself-dist/makedist.sh b/encap/src/makeself-dist/makedist.sh index 385bd5b18..d7d58014a 100755 --- a/encap/src/makeself-dist/makedist.sh +++ b/encap/src/makeself-dist/makedist.sh @@ -48,17 +48,10 @@ tar -cf $DISTDIR/epkg.tar $EPKGDIR/* # Copy bcfg2 and client deps to $DISTDIR BCFG2="`basename $EPDIR/bcfg2-[0-9].[0-9]*-encap-*.tar.gz`" -BCFG2_GETTEXT="`basename $EPDIR/bcfg2-gettext-*-encap-*.tar.gz`" -BCFG2_LIBGCC="`basename $EPDIR/bcfg2-libgcc-*.tar.gz`" -BCFG2_LIBICONV="`basename $EPDIR/bcfg2-libiconv-*-encap-*.tar.gz`" -BCFG2_LIBSTDCXX="`basename $EPDIR/bcfg2-libstdc++-*.tar.gz`" BCFG2_LIBXML2="`basename $EPDIR/bcfg2-libxml2-*-encap-*.tar.gz`" BCFG2_LIBXSLT="`basename $EPDIR/bcfg2-libxslt-*-encap-*.tar.gz`" BCFG2_LXML="`basename $EPDIR/bcfg2-lxml-*-encap-*.tar.gz`" -BCFG2_OPENSSL="`basename $EPDIR/bcfg2-openssl-*-encap-*.tar.gz`" -BCFG2_PYOPENSSL="`basename $EPDIR/bcfg2-pyopenssl-*-encap-*.tar.gz`" BCFG2_PYTHON="`basename $EPDIR/bcfg2-python-[0-9].[0-9]*-encap-*.tar.gz`" -BCFG2_ZLIB="`basename $EPDIR/bcfg2-zlib-*-encap-*.tar.gz`" DAEMONTOOLS="`basename $EPDIR/daemontools-[0-9].[0-9]*-encap-*.tar.gz`" OSTIARTY="`basename $EPDIR/ostiary-[0-9].[0-9]*-encap-*.tar.gz`" @@ -67,7 +60,7 @@ if [ "${BCFG2_PYTHON_APT_TMP}x" != 'bcfg2-python-apt-*-encap-*.tar.gzx' ]; then BCFG2_PYTHON_APT="$BCFG2_PYTHON_APT_TMP" fi -BCFG2DEPS="$BCFG2_GETTEXT $BCFG2_LIBGCC $BCFG2_LIBICONV $BCFG2_LIBSTDCXX $BCFG2_LIBXML2 $BCFG2_LIBXSLT $BCFG2_LXML $BCFG2_OPENSSL $BCFG2_PYOPENSSL $BCFG2_PYTHON $BCFG2_ZLIB $BCFG2_PYTHON_APT" +BCFG2DEPS="$BCFG2_LIBXML2 $BCFG2_LIBXSLT $BCFG2_LXML $BCFG2_PYTHON $BCFG2_PYTHON_APT" FILES="$BCFG2DEPS $BCFG2 $DAEMONTOOLS $OSTIARTY" -- cgit v1.2.3-1-g7c22