Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r1941 r1849  
    77#for linux
    88PREFIX := $(word 1, $(CASAPATH))/$(word 2,$(CASAPATH))
    9 PYTHONVER := $(shell $(shell make -s -f $(PREFIX)/makedefs VARS=PYTHONVER eval_vars) && echo $$PYTHONVER)
    10 PYDIR := $(PREFIX)/python/$(PYTHONVER)
     9PYDIR := $(PREFIX)/python/2.5
    1110
    1211ifndef ASAPROOT
    1312   ASAPROOT := $(shell pwd)
    1413endif
    15 ATNFD := external-alma
    16 PYRAPD := external/libpyrap
    1714
    1815#PY := $(wildcard python/*.py)
     
    3027module:
    3128        @if ( test -f getsvnrev.sh ) ; then /bin/bash getsvnrev.sh ; fi
    32         @cd $(ASAPROOT)/$(PYRAPD); make
    33         @cd $(ASAPROOT)/$(ATNFD); make
    3429        @cd $(ASAPROOT)/src; make
    3530        @cd $(ASAPROOT)/apps; make
     
    4338        @if ( test ! -d $(PYDIR)/asap ) ; then mkdir -p $(PYDIR)/asap ; fi
    4439        @if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
    45         @cd $(ASAPROOT)/$(ATNFD); make install
    46         @cd $(ASAPROOT)/$(PYRAPD); make install
    4740        @for file in $(LIBS) ; do cp -f $$file $(PYDIR)/asap ; done
    4841        @for file in $(BINS) ; do cp -f $$file $(PREFIX)/bin ; done
    4942        @for file in $(PY) ; do cp -f $$file $(PYDIR)/asap ; done
     43        @for file in $(APPS) ; do cp -f $$file $(PREFIX)/bin ; done
    5044        @if ( test ! -d $(PREFIX)/share/asap ) ; then mkdir -p $(PREFIX)/share/asap ; fi
    5145        @cp -f share/ipythonrc-asap $(PREFIX)/share/asap/
    52         @for file in $(APPS) ; do cp -f $$file $(PREFIX)/bin ; done
    5346        @echo "Successfully installed asap module to" $(PYDIR)
    5447
    5548clean:
    5649        @cd $(ASAPROOT)/src; make clean
    57 #       @cd $(ASAPROOT)/doc; make clean
    58         @cd $(ASAPROOT)/$(ATNFD); make realclean
    59         @cd $(ASAPROOT)/apps; make clean
    60         @cd $(ASAPROOT)/$(PYRAPD); make clean
     50        @cd $(ASAPROOT)/doc; make clean
    6151
    6252datadist:
Note: See TracChangeset for help on using the changeset viewer.