summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Joseph Barnhart Clark <dclark@pobox.com>2006-08-25 14:18:38 +0000
committerDaniel Joseph Barnhart Clark <dclark@pobox.com>2006-08-25 14:18:38 +0000
commit55f7a574065f9f1d5a27982279f90a99b7e4dd54 (patch)
treea03b18dcf3fe166c662dc377030cb1bd70e7486b
parent55f761496835c56417995ddefaf41d313fb2cda5 (diff)
downloadbcfg2-55f7a574065f9f1d5a27982279f90a99b7e4dd54.tar.gz
bcfg2-55f7a574065f9f1d5a27982279f90a99b7e4dd54.tar.bz2
bcfg2-55f7a574065f9f1d5a27982279f90a99b7e4dd54.zip
EncapProfiles: Fixed makeself and Makefile uninstall
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2111 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--encap/src/encap-profiles/Makefile2
-rw-r--r--encap/src/encap-profiles/makeself-2.1.4.ep4
2 files changed, 2 insertions, 4 deletions
diff --git a/encap/src/encap-profiles/Makefile b/encap/src/encap-profiles/Makefile
index 357758f02..13d3b2135 100644
--- a/encap/src/encap-profiles/Makefile
+++ b/encap/src/encap-profiles/Makefile
@@ -156,7 +156,7 @@ uninstall : distclean
rm -rf $(ENCAPDIR)/$${ENCAP}-*; \
rm ./$${ENCAP}-*.installed; \
done)
- test ! -d $(BASEDIR)/lib/bcfg2
+ -rm -rf $(BASEDIR)/lib/bcfg2
bcfg2only :
$(MAKE) -t; sleep 2; touch $(srcdir)/$(BCFG2).ep; $(MAKE)
diff --git a/encap/src/encap-profiles/makeself-2.1.4.ep b/encap/src/encap-profiles/makeself-2.1.4.ep
index 824d2cc40..c30f9eed6 100644
--- a/encap/src/encap-profiles/makeself-2.1.4.ep
+++ b/encap/src/encap-profiles/makeself-2.1.4.ep
@@ -16,9 +16,7 @@ subdir="/"
>
<unpack><![CDATA[
-cd .. && \
-rm -rf ${ENCAP_PKGNAME} && \
-/bin/sh ${ENCAP_PKGNAME}.run
+/bin/sh -x ${ENCAP_PKGNAME}.run
]]></unpack>
<configure>