Changeset 1915 for trunk/Makefile

Timestamp:

08/30/10 15:13:13 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (related to merge)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: make & make install

Put in Release Notes: No

Module(s): asap

Description: merged Wes's changes to Makefiles

File:

• trunk/Makefile (modified) (1 diff)

trunk/Makefile

@@ -43 +43 @@
         @if ( test ! -d $(PYDIR)/asap ) ; then mkdir -p $(PYDIR)/asap ; fi
         @if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+        @cd $(ASAPROOT)/$(ATNFD); make install
+        @cd $(ASAPROOT)/$(PYRAPD); make install
         @for file in $(LIBS) ; do cp -f $$file $(PYDIR)/asap ; done
         @for file in $(BINS) ; do cp -f $$file $(PREFIX)/bin ; done
         @for file in $(PY) ; do cp -f $$file $(PYDIR)/asap ; done
-        @for file in $(APPS) ; do cp -f $$file $(PREFIX)/bin ; done
         @if ( test ! -d $(PREFIX)/share/asap ) ; then mkdir -p $(PREFIX)/share/asap ; fi
         @cp -f share/ipythonrc-asap $(PREFIX)/share/asap/
-        @cd $(ASAPROOT)/$(PYRAPD); make install
-        @cd $(ASAPROOT)/$(ATNFD); make install
+        @for file in $(APPS) ; do cp -f $$file $(PREFIX)/bin ; done
         @echo "Successfully installed asap module to" $(PYDIR)