oshmem: Do not install headers in case oshmem is off

oshmem/include/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (c) 2013      Mellanox Technologies, Inc.
+# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
 #                         All rights reserved.
 # $COPYRIGHT$
 #
@@ -11,14 +11,10 @@
 headers = oshmem_config.h
 nodist_headers =
 
+if PROJECT_OSHMEM
 # Install these in $(includedir)
 include_HEADERS =
 
-# Install these in $(includedir)
-mppincludedir = $(includedir)/mpp
-mppinclude_HEADERS = mpp/shmem.h \
-                     mpp/shmem.fh
-
 # Always install these in $(pkgincludedir)
 pkginclude_HEADERS =
 
@@ -26,6 +22,9 @@ include_HEADERS += shmem.fh \
         shmemx.h \
         shmem-compat.h
 
+nobase_include_HEADERS = mpp/shmem.h \
+                         mpp/shmem.fh
+
 # These files are always installed in $(includedir), but shouldn't be
 # shipped since they are generated by configure from their .in
 # counterparts (which AM automatically ships).
@@ -36,8 +35,10 @@ include_HEADERS += pshmem.h \
         pshmemx.h
 endif
 
-nobase_dist_noinst_HEADERS = $(headers)
+oshmemdir=${includedir}/openshmem
-nobase_nodist_noinst_HEADERS = $(nodist_headers)
+nobase_dist_oshmem_HEADERS = $(headers)
+nobase_nodist_oshmem_HEADERS = $(nodist_headers)
+endif
 
 distclean-local: