Changes in trunk/Makefile [1849:1941]

File:

• trunk/Makefile (modified) (3 diffs, 1 prop)

trunk/Makefile

@@ -7 +7 @@
 #for linux
 PREFIX := $(word 1, $(CASAPATH))/$(word 2,$(CASAPATH))
-PYDIR := $(PREFIX)/python/2.5
+PYTHONVER := $(shell $(shell make -s -f $(PREFIX)/makedefs VARS=PYTHONVER eval_vars) && echo $$PYTHONVER)
+PYDIR := $(PREFIX)/python/$(PYTHONVER)
 
 ifndef ASAPROOT
    ASAPROOT := $(shell pwd)
 endif
+ATNFD := external-alma
+PYRAPD := external/libpyrap
 
 #PY := $(wildcard python/*.py)
@@ -27 +30 @@
 module:
         @if ( test -f getsvnrev.sh ) ; then /bin/bash getsvnrev.sh ; fi
+        @cd $(ASAPROOT)/$(PYRAPD); make
+        @cd $(ASAPROOT)/$(ATNFD); make
         @cd $(ASAPROOT)/src; make
         @cd $(ASAPROOT)/apps; make
@@ -38 +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/
+        @for file in $(APPS) ; do cp -f $$file $(PREFIX)/bin ; done
         @echo "Successfully installed asap module to" $(PYDIR)
 
 clean:
         @cd $(ASAPROOT)/src; make clean
-        @cd $(ASAPROOT)/doc; make clean
+#       @cd $(ASAPROOT)/doc; make clean
+        @cd $(ASAPROOT)/$(ATNFD); make realclean
+        @cd $(ASAPROOT)/apps; make clean
+        @cd $(ASAPROOT)/$(PYRAPD); make clean
 
 datadist: