Changeset 1898


Ignore:
Timestamp:
08/25/10 11:43:58 (14 years ago)
Author:
Kana Sugimoto
Message:

New Development: No

JIRA Issue: No (related to asap merge)

Ready for Test: Yes

Interface Changes: No

Test Programs: build asap with make

Put in Release Notes: No

Module(s): asap

Description: Merged Jonas' modification for platform detection.


Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/external-alma/Makefile

    r1896 r1898  
    66ATNFDIR := $(EXTDIR)/atnf
    77
    8 # the casa environment AIPSPATH has to be defined
     8# the casa environment CASAPATH has to be defined
    99CASAROOT  := $(word 1, $(CASAPATH))
    1010CASAARCH  := $(word 2, $(CASAPATH))
    … …  
    2626#USELIB := lib64
    2727
    28 ifneq (,$(findstring "darwin", "$(CASAARCH)"))
     28ifeq ($(shell uname), Darwin)
    2929        TARGETLIB   := libatnf.dylib
    3030else
    … …  
    5353
    5454LDFLAGS   += -shared
    55 ifneq (, $(findstring "darwin", "$(CASAARCH)"))
     55ifeq ($(shell uname), Darwin)
    5656           LDFLAGS += -headerpad_max_install_names -install_name $(CASAROOT)/$(CASAARCH)/lib/$(TARGETLIB)
    5757endif

  • trunk/src/Makefile

    r1894 r1898  
    6060
    6161# darwin specific CASA flags
    62 ifneq (,$(findstring $(CASAARCH)", "darwin"))
     62ifeq ($(shell uname), Darwin)
    6363   CASAPPLIB += -framework vecLib
    6464else
Note: See TracChangeset for help on using the changeset viewer.