diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-09-12 19:21:54 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-09-12 19:21:54 +0000 |
| commit | d8009e9f46263f44f99a99e58996f418d23e6d24 (patch) | |
| tree | d3d93147a5b252e7cd75ce94bfc11783d04e073a /DAnCE/rules.dance.GNU | |
| parent | 689cddcafb71618e8e8cb4b8c6baf05d953b3ba6 (diff) | |
| download | ATCD-d8009e9f46263f44f99a99e58996f418d23e6d24.tar.gz | |
Sun Sep 12 19:21:42 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* rules.dance.GNU:
Fixes.
Diffstat (limited to 'DAnCE/rules.dance.GNU')
| -rw-r--r-- | DAnCE/rules.dance.GNU | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/DAnCE/rules.dance.GNU b/DAnCE/rules.dance.GNU index 33586ce4ed8..96fea7fd370 100644 --- a/DAnCE/rules.dance.GNU +++ b/DAnCE/rules.dance.GNU @@ -19,8 +19,8 @@ endif DANCE_ROOT := $(subst \,/,$(DANCE_ROOT)) -ifeq (,$(findstring -L$(DANCE_ROOT)/ciao,$(LDFLAGS))) - LDFLAGS += -L$(DANCE_ROOT)/ciao +ifeq (,$(findstring -L$(DANCE_ROOT)/DAnCE,$(LDFLAGS))) + LDFLAGS += -L$(DANCE_ROOT)/DAnCE endif ifeq (,$(findstring -I$(DANCE_ROOT),$(INCLDIRS))) INCLDIRS += -I$(DANCE_ROOT) @@ -36,9 +36,9 @@ DANCE_MAJOR_VERSION := $(shell awk "/DANCE_MAJOR_VERSION/ { print $$3}" ${DANCE_ DANCE_MINOR_VERSION := $(shell awk "/DANCE_MINOR_VERSION/ { print $$3}" ${DANCE_ROOT}/DAnCE/Version.h) DANCE_BETA_VERSION := $(shell awk "/DANCE_BETA_VERSION/ { print $$3}" ${DANCE_ROOT}/DAnCE/Version.h) else -DANCE_MAJOR_VERSION := $(shell awk '/DANCE_MAJOR_VERSION/ { print $$3}' ${DANCE_ROOT}/ciao/Version.h) -DANCE_MINOR_VERSION := $(shell awk '/DANCE_MINOR_VERSION/ { print $$3}' ${DANCE_ROOT}/ciao/Version.h) -DANCE_BETA_VERSION := $(shell awk '/DANCE_BETA_VERSION/ { print $$3}' ${DANCE_ROOT}/ciao/Version.h) +DANCE_MAJOR_VERSION := $(shell awk '/DANCE_MAJOR_VERSION/ { print $$3}' ${DANCE_ROOT}/DAnCE/Version.h) +DANCE_MINOR_VERSION := $(shell awk '/DANCE_MINOR_VERSION/ { print $$3}' ${DANCE_ROOT}/DAnCE/Version.h) +DANCE_BETA_VERSION := $(shell awk '/DANCE_BETA_VERSION/ { print $$3}' ${DANCE_ROOT}/DAnCE/Version.h) endif # Version number of the libraries |