get isode headers from the right place

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3787 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/isode/compat/Makefile.in b/src/isode/compat/Makefile.in
index 9f725baed7da4da9a7aa8c3f981e4ee1e0e6694b..32599d41cd9deae9c39b20f86f91d4f401379ec8 100644 (file)
--- a/src/isode/compat/Makefile.in
+++ b/src/isode/compat/Makefile.in
@@ -8,9 +8,13 @@ VPATH = @srcdir@
 BUILDTOP = ../../
 TOPDIR = $(BUILDTOP)
 
-OPTIONS        =       -I. -I$(HDIR) $(PEPYPATH) $(KRBOPT)
+OPTIONS        =       -I. -I$(HDIR) -I$(ISODEINC) $(PEPYPATH) $(KRBOPT)
 CFLAGS  =       $(OPTIONS) $(LOPTIONS) 
 
+KRBINC =       $(TOPDIR)include/
+ISODEINCM=     $(KRBINC)isode
+ISODEINC=      $(ISODEINCM)/
+
 HDIR   =       $(TOPDIR)isode/h/
 UTILDIR        =       $(TOPDIR)isode/util/
 INCDIRM        =       $(HDIR)

diff --git a/src/isode/h/Makefile.in b/src/isode/h/Makefile.in
index 610ce8ecf89a3589baf23365cc4fd096db407d72..92e3b1baa6165e505d4b09004c550687d89e2b81 100644 (file)
--- a/src/isode/h/Makefile.in
+++ b/src/isode/h/Makefile.in
@@ -65,7 +65,7 @@ FHEADERS=     fpkt.h ftam.h
 ##################################################################
 
 all:;  -mkdir $(ISODEINCM)
-       @for h in $(HEADERS); do cp $$h $(ISODEINC)/$$h; done
+       @for h in $(HEADERS); do cp $(srcdir)/$$h $(ISODEINC)/$$h; done
        -@echo copied $(HEADERS)
 
 inst-all:;     -mkdir $(INCDIRM)

diff --git a/src/isode/psap/Makefile.in b/src/isode/psap/Makefile.in
index 616f5aae4cfd41f6336a85a0fb25ae18255fc2f5..dc1d77338f13931f9c325dd4fe40475aeea79a3c 100644 (file)
--- a/src/isode/psap/Makefile.in
+++ b/src/isode/psap/Makefile.in
@@ -9,9 +9,13 @@ BUILDTOP = ../../
 TOPDIR = $(BUILDTOP)
 LIBDIR =       $(TOPDIR)lib/
 
-OPTIONS        =       -I. -I$(HDIR) $(PEPYPATH) $(KRBOPT)
+OPTIONS        =       -I. -I$(HDIR) -I$(ISODEINC) $(PEPYPATH) $(KRBOPT)
 CFLAGS  =       $(OPTIONS) $(LOPTIONS) 
 
+KRBINC =       $(TOPDIR)include/
+ISODEINCM=     $(KRBINC)isode
+ISODEINC=      $(ISODEINCM)/
+
 HDIR   =       $(TOPDIR)isode/h/
 UTILDIR        =       $(TOPDIR)isode/util/
 INCDIRM        =       $(HDIR)