From dab3e2cba27b04cf8901d6fdfa64dd719f937ef2 Mon Sep 17 00:00:00 2001
From: jacob <jacob>
Date: Thu, 10 Jun 2004 23:25:29 +0000
Subject: [PATCH] b=3533 r=adilger

fixes from 1.2.2 release to make --disable/--enable work correctly for
buliding packages.
---
 lnet/ulnds/Makefile.am           | 6 +++---
 lnet/ulnds/socklnd/Makefile.am   | 6 +++---
 lustre/portals/unals/Makefile.am | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lnet/ulnds/Makefile.am b/lnet/ulnds/Makefile.am
index 1681250..3437d39 100644
--- a/lnet/ulnds/Makefile.am
+++ b/lnet/ulnds/Makefile.am
@@ -1,10 +1,10 @@
 if LIBLUSTRE
+if !CRAY_PORTALS
 noinst_LIBRARIES = libtcpnal.a
 endif
+endif
 
-if !CRAY_PORTALS
-pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
+noinst_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
 libtcpnal_a_CPPFLAGS = $(LLCPPFLAGS)
 libtcpnal_a_CFLAGS = $(LLCFLAGS)
-endif
\ No newline at end of file
diff --git a/lnet/ulnds/socklnd/Makefile.am b/lnet/ulnds/socklnd/Makefile.am
index 1681250..3437d39 100644
--- a/lnet/ulnds/socklnd/Makefile.am
+++ b/lnet/ulnds/socklnd/Makefile.am
@@ -1,10 +1,10 @@
 if LIBLUSTRE
+if !CRAY_PORTALS
 noinst_LIBRARIES = libtcpnal.a
 endif
+endif
 
-if !CRAY_PORTALS
-pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
+noinst_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
 libtcpnal_a_CPPFLAGS = $(LLCPPFLAGS)
 libtcpnal_a_CFLAGS = $(LLCFLAGS)
-endif
\ No newline at end of file
diff --git a/lustre/portals/unals/Makefile.am b/lustre/portals/unals/Makefile.am
index 1681250..3437d39 100644
--- a/lustre/portals/unals/Makefile.am
+++ b/lustre/portals/unals/Makefile.am
@@ -1,10 +1,10 @@
 if LIBLUSTRE
+if !CRAY_PORTALS
 noinst_LIBRARIES = libtcpnal.a
 endif
+endif
 
-if !CRAY_PORTALS
-pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
+noinst_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
 libtcpnal_a_CPPFLAGS = $(LLCPPFLAGS)
 libtcpnal_a_CFLAGS = $(LLCFLAGS)
-endif
\ No newline at end of file
-- 
1.8.3.1