[src/trunk]: src The last change I made was a little aggressive in changing t...

[elric <elric%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3e2f1b2ad8e2
branches:  trunk
changeset: 542364:3e2f1b2ad8e2
user:      elric <elric%NetBSD.org@localhost>
date:      Mon Jan 27 06:19:40 2003 +0000

description:
The last change I made was a little aggressive in changing the paths of
the includes and broke cross builds from non-NetBSD arches.  In this I
revert the problem section.  (pointed out by uwe.)

diffstat:

 crypto/dist/heimdal/heimdal2netbsd       |  6 ++----
 crypto/dist/heimdal/lib/roken/roken.h.in |  4 ++--
 include/heimdal/roken.h                  |  4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diffs (77 lines):

diff -r 7ee85b09d27d -r 3e2f1b2ad8e2 crypto/dist/heimdal/heimdal2netbsd
--- a/crypto/dist/heimdal/heimdal2netbsd        Mon Jan 27 05:00:54 2003 +0000
+++ b/crypto/dist/heimdal/heimdal2netbsd        Mon Jan 27 06:19:40 2003 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # $Heimdal: heimdal2netbsd,v 1.3 2002/09/12 14:12:18 joda Exp $
-# $NetBSD: heimdal2netbsd,v 1.5 2003/01/26 21:59:49 elric Exp $
+# $NetBSD: heimdal2netbsd,v 1.6 2003/01/27 06:19:40 elric Exp $
 
 if [ \! -f kuser/kinit.c ]; then 
        echo "`basename $0`: should be run in top src directory" 1>&2
@@ -21,7 +21,7 @@
 echo 'Fixing .Os in man pages.'
 perl -i~ -p -e 's/\.Os HEIMDAL/.Os/' `find . -name '*.[1358]'`
 
-echo 'Changing $Id: heimdal2netbsd,v 1.5 2003/01/26 21:59:49 elric Exp $ to $Heimdal$.'
+echo 'Changing $Id: heimdal2netbsd,v 1.6 2003/01/27 06:19:40 elric Exp $ to $Heimdal$.'
 ## Ugh!
 set -- 'RCSID\("'      '"\)'   '__RCSID("'     '"\n        "\$NetBSD\$")' \
        '/\* '          ' \*/'  '/* '           '\n   \$NetBSD\$ */'       \
@@ -56,13 +56,11 @@
            -e 's,#include <hdb_err.h>,#include <krb5/hdb_err.h>,'            \
            -e 's,#include <hdb-protos.h>,#include <krb5/hdb-protos.h>,'      \
            -e 's,#include <krb5-protos.h>,#include <krb5/krb5-protos.h>,'    \
-           -e 's,#include <roken-common.h>,#include <krb5/roken-common.h>,'  \
            -e 's,#include <sl.h>,#include <krb5/sl.h>,'
 }
 
 update_inc lib/krb5/krb5.h
 update_inc lib/hdb/hdb.h
-update_inc lib/roken/roken.h.in
 update_inc lib/sl/ss.h
 
 echo 'Remember to update files in basesrc/include/heimdal/.'
diff -r 7ee85b09d27d -r 3e2f1b2ad8e2 crypto/dist/heimdal/lib/roken/roken.h.in
--- a/crypto/dist/heimdal/lib/roken/roken.h.in  Mon Jan 27 05:00:54 2003 +0000
+++ b/crypto/dist/heimdal/lib/roken/roken.h.in  Mon Jan 27 06:19:40 2003 +0000
@@ -33,7 +33,7 @@
  */
 
 /* $Heimdal: roken.h.in,v 1.169 2002/08/26 21:43:38 assar Exp $
-   $NetBSD: roken.h.in,v 1.3 2003/01/26 22:06:40 elric Exp $ */
+   $NetBSD: roken.h.in,v 1.4 2003/01/27 06:19:41 elric Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -148,7 +148,7 @@
 typedef int ssize_t;
 #endif
 
-#include <krb5/roken-common.h>
+#include <roken-common.h>
 
 ROKEN_CPP_START
 
diff -r 7ee85b09d27d -r 3e2f1b2ad8e2 include/heimdal/roken.h
--- a/include/heimdal/roken.h   Mon Jan 27 05:00:54 2003 +0000
+++ b/include/heimdal/roken.h   Mon Jan 27 06:19:40 2003 +0000
@@ -39,7 +39,7 @@
  */
 
 /* $Heimdal: roken.h.in,v 1.169 2002/08/26 21:43:38 assar Exp $ 
-   $NetBSD: roken.h,v 1.9 2003/01/26 22:19:36 elric Exp $ */
+   $NetBSD: roken.h,v 1.10 2003/01/27 06:19:41 elric Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -77,7 +77,7 @@
 
 #define ROKEN_LIB_FUNCTION
 
-#include <krb5/roken-common.h>
+#include <roken-common.h>
 
 ROKEN_CPP_START