[cig-commits] r14679 - mc/1D/hc/trunk

[walter at geodynamics.org]

Author: walter
Date: 2009-04-13 15:38:25 -0700 (Mon, 13 Apr 2009)
New Revision: 14679

Modified:
   mc/1D/hc/trunk/Makefile
   mc/1D/hc/trunk/make_binary_package
Log:
Clean up Makefile and make_binary_package

Modified: mc/1D/hc/trunk/Makefile
===================================================================
--- mc/1D/hc/trunk/Makefile	2009-04-13 19:59:53 UTC (rev 14678)
+++ mc/1D/hc/trunk/Makefile	2009-04-13 22:38:25 UTC (rev 14679)
@@ -112,13 +112,12 @@
 HC_LIBS = $(ODIR)/libhc.a 
 HC_LIBS_DEBUG =  $(ODIR)/libhc.dbg.a
 
-LIB_FLAGS = -L$(HOME)/progs/lib/$(ARCH)/ \
-	$(HEAL_LIB_FLAGS) $(RICK_LIB_FLAGS) \
+LIB_FLAGS = $(HEAL_LIB_FLAGS) $(RICK_LIB_FLAGS) \
 	$(GGRD_LIB_FLAGS) \
 	-L$(ODIR)/
 
 #
-INC_FLAGS = -I$(HOME)/progs/include/  $(HEAL_INC_FLAGS) \
+INC_FLAGS =  $(HEAL_INC_FLAGS) \
 	$(RICK_INC_FLAGS) $(GGRD_INC_FLAGS) 
 #
 # includes 

Modified: mc/1D/hc/trunk/make_binary_package
===================================================================
--- mc/1D/hc/trunk/make_binary_package	2009-04-13 19:59:53 UTC (rev 14678)
+++ mc/1D/hc/trunk/make_binary_package	2009-04-13 22:38:25 UTC (rev 14679)
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # create a directory with the binaries.  It invokes make, so it needs
-# NETCDFHOME and GMTHOME set.
+# NETCDFHOME and GMTHOME set.  ARCH should not be set.
 
 ver=${1-1.0}
 date=`date '+%m%d%y'`
@@ -9,12 +9,12 @@
 dest=../hc-$ver.$date
 
 CFLAGS="-O2" LDFLAGS="-static" make all
-strip bin/* bin/*/*
+strip bin/*
 
 mkdir "$dest"
 cp README.TXT calc_vel_and_plot "$dest"
-mkdir "$dest/example_data" "$dest/prem"
-cp -a bin/ "$dest"
+mkdir "$dest/example_data" "$dest/prem" "$dest/bin"
+cp bin/* "$dest"
 cp example_data/* "$dest/example_data"
 cp prem/* "$dest/prem"
 mkdir "$dest/hcplates"