HPUX: Fix osi_debug.c includes

osi_debug.c was trying to include fcrypt.h and private_data.h. But the
former is in the rx subdirectory, and the latter is in src/rxkad. So,
specify a more complete path for fcrypt.h, and put src/rxkad in the
include list for osi_debug.c so we can build again.

Change-Id: I5754f56354f40bd3697ac286cb0820041fda0b00
Reviewed-on: http://gerrit.openafs.org/4024
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/HPUX/osi_debug.c b/src/afs/HPUX/osi_debug.c
index ed0f159acb5bd70cb150bcf6a97db67f77ff91c9..2448cb7d940b7c7c29a42533835653cfe8f3f490 100644 (file)
--- a/src/afs/HPUX/osi_debug.c
+++ b/src/afs/HPUX/osi_debug.c
@@ -20,7 +20,7 @@
 #include "afs_trace.h"
 #include "afs.h"
 #include "exporter.h"
-#include "fcrypt.h"
+#include <rx/fcrypt.h>
 #include "nfsclient.h"
 #include "private_data.h"
 #include "vice.h"

diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in
index 00f533070c2a519d97f7c09065f4512317380331..55c6eb840f8582849af5a1d60afa7053462160b1 100644 (file)
--- a/src/libafs/Makefile.common.in
+++ b/src/libafs/Makefile.common.in
@@ -612,6 +612,7 @@ osi_vm.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vm.c
        $(CRULE_NOOPT)
 osi_vnodeops.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vnodeops.c
        $(CRULE_NOOPT)
+CFLAGS-osi_debug.o = -I${TOP_SRCDIR}/rxkad
 osi_debug.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_debug.c
        $(CRULE_OPT)
 osi_ioctl.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_ioctl.c