From 1a6678a7b6c79f576c73ba6b340197a9ff111c00 Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Tue, 19 Oct 2004 10:48:59 +0000
Subject: [PATCH] *** empty log message ***

---
 Cantera/fortran/src/Makefile.in |  1 -
 Makefile.in                     |  5 ++++-
 tools/src/package4mac.in        | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Cantera/fortran/src/Makefile.in b/Cantera/fortran/src/Makefile.in
index 5c4853da5..d39f1452c 100644
--- a/Cantera/fortran/src/Makefile.in
+++ b/Cantera/fortran/src/Makefile.in
@@ -78,7 +78,6 @@ FTLIB = @buildlib@/$(LIB_NAME)
 $(FTLIB): $(MODFILES) $(USER_MODULE_OBJS) $(CXX_OBJS) $(LIB_DEPS)
 	$(RM)     $(FTLIB)
 	@ARCHIVE@ $(FTLIB) $(OBJS) 
-	cp -f $(MODFILES) $(MODULE_DIR)
 
 clean:
 	$(RM) $(OBJS) $(FTLIB) $(MODFILES)
diff --git a/Makefile.in b/Makefile.in
index 1b79a3949..3ce75c850 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -116,7 +116,7 @@ hdr-install:
 
 f90-modules-install:
 ifeq ($(build_f90),1)
-	cp -f build/include/cantera/*.mod @ct_incroot@
+	cp -f build/include/cantera/*.mod @ct_incroot@/cantera
 endif
 
 # collect scattered header files and build the include directory
@@ -135,6 +135,9 @@ hdr-collect:
 	@INSTALL@ Cantera/src/zeroD/*.h build/include/cantera/kernel/zeroD
 	@INSTALL@ Cantera/src/converters/*.h build/include/cantera/kernel/converters
 	@INSTALL@ Cantera/src/transport/*.h build/include/cantera/kernel/transport
+ifeq ($(build_f90),1)
+	@INSTALL@ Cantera/fortran/src/*.mod build/include/cantera
+endif
 
 particles:
 ifeq ($(build_particles),1)
diff --git a/tools/src/package4mac.in b/tools/src/package4mac.in
index b71ad2732..8cd0d81d7 100644
--- a/tools/src/package4mac.in
+++ b/tools/src/package4mac.in
@@ -24,8 +24,17 @@ $INSTALL -d $RESDIR
 $INSTALL -d $NUMPYDIR/Numeric
 $INSTALL -d $NUMRESDIR
 
+rm -r -f $CTDIR/*
+rm -r -f $PYDIR/*
+rm -r -f $RESDIR/*
+rm -r -f $NUMPYDIR/*
+rm -r -f $NUMRESDIR/*
+
 cp -R -f $instdir/* $CTDIR
 chmod +x $CTDIR/bin/*
+rm -r -f $CTDIR/lib
+
+cp -R -f $PKGDIR/apps/* $CTDIR
 
 cp -R -f $pylibdir/Cantera/* $PYDIR/Cantera
 cp -R -f $pylibdir/MixMaster/* $PYDIR/MixMaster
@@ -38,3 +47,4 @@ cp -f @ctroot@/License.rtf $RESDIR
 
 cp -R -f $pylibdir/Numeric/* $NUMPYDIR/Numeric
 cp -f $pylibdir/Numeric.pth $NUMPYDIR
+