diff options
author | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2006-08-04 00:31:01 +0000 |
---|---|---|
committer | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2006-08-04 00:31:01 +0000 |
commit | 1883f2eb1b3f801e93f8f1064bf4794a31f61594 (patch) | |
tree | f50f9b124c3119c1832c038e74a882415cc49dc0 /encap/Makefile | |
parent | 902c3519f67eaa7119c02bd78b65bf97f28103be (diff) | |
download | bcfg2-1883f2eb1b3f801e93f8f1064bf4794a31f61594.tar.gz bcfg2-1883f2eb1b3f801e93f8f1064bf4794a31f61594.tar.bz2 bcfg2-1883f2eb1b3f801e93f8f1064bf4794a31f61594.zip |
* Replace ugly, brittle patch to fix paths for the encap packages
to an ugly, hopefully less brittle search-and-replace function
(this also removes the dependancy on GNU patch; patch is also
called from the Server code, but the server should only be run
on GNU/Linux anyway)
* daemontools is still dependant on GNU patch, so moved that to
a non-bcfg2-specific built-time prereq for daemontools.
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2039 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'encap/Makefile')
-rw-r--r-- | encap/Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/encap/Makefile b/encap/Makefile index 3c0da0035..471033fa8 100644 --- a/encap/Makefile +++ b/encap/Makefile @@ -17,7 +17,6 @@ ZLIB = bcfg2-zlib-1.2.3 LIBICONV = bcfg2-libiconv-1.9.2 GETTEXT = bcfg2-gettext-0.14.5 PKG-CONFIG = bcfg2-pkg-config-0.20 -PATCH = bcfg2-patch-2.5.9 OPENSSL = bcfg2-openssl-0.9.8b LIBSTDCXX = bcfg2-libstdc++-0.1 LIBGCC = bcfg2-libgcc-0.1 @@ -89,8 +88,7 @@ ${ZLIB}.installed : ${M4}.installed ${LIBICONV}.installed : ${ZLIB}.installed ${GETTEXT}.installed : ${LIBICONV}.installed ${PKG-CONFIG}.installed : ${GETTEXT}.installed -${PATCH}.installed : ${PKG-CONFIG}.installed -${OPENSSL}.installed : ${PATCH}.installed +${OPENSSL}.installed : ${PKG-CONFIG}.installed ${LIBSTDCXX}.installed : ${OPENSSL}.installed ${LIBGCC}.installed : ${LIBSTDCXX}.installed ${PYTHON}.installed : ${LIBGCC}.installed @@ -103,8 +101,7 @@ ${BCFG2}.installed : ${LXML}.installed ${LIBICONV}.packaged : ${ZLIB}.packaged ${GETTEXT}.packaged : ${LIBICONV}.packaged -${PATCH}.packaged : ${GETTEXT}.packaged -${OPENSSL}.packaged : ${PATCH}.packaged +${OPENSSL}.packaged : ${GETTEXT}.packaged ${LIBSTDCXX}.packaged : ${OPENSSL}.packaged ${LIBGCC}.packaged : ${LIBSTDCXX}.packaged ${PYTHON}.packaged : ${LIBGCC}.packaged @@ -113,4 +110,3 @@ ${LIBXML2}.packaged : ${PYOPENSSL}.packaged ${LIBXSLT}.packaged : ${LIBXML2}.packaged ${LXML}.packaged : ${LIBXSLT}.packaged ${BCFG2}.packaged : ${LXML}.packaged - |