Changeset 1898 for trunk/external-alma

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.

File:

• trunk/external-alma/Makefile (modified) (3 diffs)

trunk/external-alma/Makefile

@@ -6 +6 @@
 ATNFDIR := $(EXTDIR)/atnf
 
-# the casa environment AIPSPATH has to be defined
+# the casa environment CASAPATH has to be defined
 CASAROOT  := $(word 1, $(CASAPATH))
 CASAARCH  := $(word 2, $(CASAPATH))
@@ -26 +26 @@
 #USELIB := lib64
 
-ifneq (,$(findstring "darwin", "$(CASAARCH)"))
+ifeq ($(shell uname), Darwin)
         TARGETLIB   := libatnf.dylib
 else
@@ -53 +53 @@
 
 LDFLAGS   += -shared
-ifneq (, $(findstring "darwin", "$(CASAARCH)"))
+ifeq ($(shell uname), Darwin)
            LDFLAGS += -headerpad_max_install_names -install_name $(CASAROOT)/$(CASAARCH)/lib/$(TARGETLIB)
 endif