From edf5e5dc6838d6b57a0c533d7529ca49397754bc Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Sat, 26 Aug 2006 18:14:39 +0000
Subject: EncapPackages: Update makefiles

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2120 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/Makefile               | 14 +++++++++++++-
 encap/src/makeself-dist/Makefile | 14 +++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'encap')

diff --git a/encap/src/Makefile b/encap/src/Makefile
index a58899e09..e85fb555f 100644
--- a/encap/src/Makefile
+++ b/encap/src/Makefile
@@ -5,15 +5,27 @@ export SHELL = /bin/sh
 .PHONY : test log all clean uninstall
 
 log :
+	@printf "Building in background, and logging to ./make.log\n"
 	( $(MAKE) all > ./make.log 2>&1 ) &
 
 all :
 	$(MAKE) -C ./encap-profiles all
 	$(MAKE) -C ./bcfg2-site all
 	$(MAKE) -C ./makeself-dist all
+	@printf "\n\nencap build finished...\n"
+	@printf "\tClient install self-extracting/installing package is:\n"
+	@printf "\t\t%s\n" "`ls ./makeself-dist/*.run 2>/dev/null`"
+	@printf "\tUse 'epkg -i <packagename>' to install encap packages...\n"
+	@printf "\t\tDoc encap packages are:\n"
+	-@(ls ./encap-profiles/*doc*.tar.gz 2>/dev/null | sed 's/^/\t\t\t/g')
+	@printf "\t\tServer encap packages, if built (GNU/Linux only), are:\n"
+	-@printf "\t\t\t%s\n" "`ls ./encap-profiles/bcfg2-glib-*.tar.gz 2>/dev/null`"
+	-@printf "\t\t\t%s\n" "`ls ./encap-profiles/bcfg2-gamin-*.tar.gz 2>/dev/null`"
+	-@printf "\t\t\t%s\n" "`ls ./encap-profiles/bcfg2-cheetah-[0-9]*.tar.gz 2>/dev/null`"
+	@printf "\n"
     
 clean :
-	-rm ./*.log ./*~
+	-rm ./*.log ./*~ ./\#*
 	
 uninstall : clean
 	$(MAKE) -C ./encap-profiles uninstall
diff --git a/encap/src/makeself-dist/Makefile b/encap/src/makeself-dist/Makefile
index ac1cab15e..1637aad88 100644
--- a/encap/src/makeself-dist/Makefile
+++ b/encap/src/makeself-dist/Makefile
@@ -1,19 +1,19 @@
 # $Id$
 
 # Variables
-
-PATH = /usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/bin:/bin
-MAKESELF = /usr/local/bin/makeself.sh
+export SHELL = /bin/sh
+export PATH = /usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/bin:/bin
 
 # Main
 
-.PHONY : all clean distclean install
+.PHONY : all clean distclean
 .SUFFIXES : 
 
 all : 
+	chmod 755 ./makedist.sh && ./makedist.sh
 
 clean :
+	-rm ./*~ ./\#*
 
-distclean :
-
-install :
+distclean : clean
+	-rm -rf ./bcfg2-*
-- 
cgit v1.2.3-1-g7c22