From 55f7a574065f9f1d5a27982279f90a99b7e4dd54 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Fri, 25 Aug 2006 14:18:38 +0000
Subject: EncapProfiles: Fixed makeself and Makefile uninstall

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2111 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/Makefile          | 2 +-
 encap/src/encap-profiles/makeself-2.1.4.ep | 4 +---
 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>
-- 
cgit v1.2.3-1-g7c22