[kitten] push by BrianK...@gmail.com - Fixed an earlier merge conflict on 2013-08-07 20:03 GMT

[kit...@googlecode.com]

Revision: 2b39a6850ff3
Branch: default
Author: Brian Kocoloski <bko...@sandia.gov>
Date: Wed Aug 7 13:03:08 2013
Log: Fixed an earlier merge conflict
http://code.google.com/p/kitten/source/detail?r=2b39a6850ff3

Modified:
/user/runtime2/pct/Makefile

=======================================
--- /user/runtime2/pct/Makefile Wed Aug 7 12:54:32 2013
+++ /user/runtime2/pct/Makefile Wed Aug 7 13:03:08 2013
@@ -21,8 +21,7 @@
INCDIRS += -I${PMI_COMMON_BASE}

pct_LDADD = -lportals -lportals_ppe -lportals_util -lxpmem -llwk -lrt
-
-ifdef USE_PIAPI
+ifeq ($(PIAPI),y)
CFLAGS += -DUSING_PIAPI
pct_LDADD += -lpiapi
endif