[Lunar-commits] <moonbase> heimdal: Location changes of some files

[Stefan Wold]

commit 29eabf5690566d1c10b7d3d203b9b5846b741698
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Thu Feb 21 12:16:03 2008 +0100

    heimdal: Location changes of some files
---
 crypto/heimdal/BUILD |   45 ++++++++++++++++++++++++++++++---------------
 1 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/crypto/heimdal/BUILD b/crypto/heimdal/BUILD
index eb5a8e9..84b1155 100644
--- a/crypto/heimdal/BUILD
+++ b/crypto/heimdal/BUILD
@@ -2,10 +2,12 @@
 
   OPTS+=" --prefix=/usr \
           --libexecdir=/usr/sbin \
+          --datadir=/var/lib/heimdal \
+          --localstatedir=/var/lib/heimdal \
+          --sysconfdir=/etc \
           --enable-shared \
           --enable-readline-dir=/usr \
-          --enable-openssl=/usr \
-          --includedir=/usr/include/heimdal" &&
+          --enable-openssl=/usr" &&
 
   if [ "$KRB4" == "y" ]; then
     OPTS+=" --with-krb4"
@@ -13,7 +15,31 @@
     OPTS+=" --without-krb4"
   fi &&
 
-  HEIMDALINC=/usr/include/heimdal &&
+  # Change default datadir (hardcoded)
+  sedit "s;var/heimdal;var/lib/heimdal;g" configure.in configure \
+	doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
+	lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5
+
+
+  # Migration code, remove symlinks
+  REMOVE_KRB="gssapi krb5-types.h krb5.h asn1_err.h krb5_asn1.h \
+              krb5_err.h heim_err.h k524_err.h krb5-protos.h"
+
+  for i in $REMOVE_KRB; do
+    rm -f /usr/include/${i}
+  done &&
+
+  if [ -d /usr/include/heimdal ]; then
+    rm -rf /usr/include/heimdal
+  else
+    rm -f /usr/include/heimdal
+  fi &&
+
+  # DB location changed to a sane place
+  if [ -d /var/heimdal ] && [ ! -d /var/lib/heimdal ]; then
+    mv -f /var/heimdal /var/lib/heimdal
+  fi &&
+
 
   patch_it $SOURCE2 1 &&
   patch_it $SOURCE3 1 &&
@@ -21,17 +47,6 @@
 
   sh autogen.sh &&
 
-  default_build &&
-
-  # Cleaner symlinks
-  ln -sf $HEIMDALINC/gssapi /usr/include/gssapi &&
-  ln -sf $HEIMDALINC/krb5-types.h /usr/include/krb5-types.h &&
-  ln -sf $HEIMDALINC/krb5.h /usr/include/krb5.h &&
-  ln -sf $HEIMDALINC/asn1_err.h /usr/include/asn1_err.h &&
-  ln -sf $HEIMDALINC/krb5_asn1.h /usr/include/krb5_asn1.h &&
-  ln -sf $HEIMDALINC/krb5_err.h /usr/include/krb5_err.h &&
-  ln -sf $HEIMDALINC/heim_err.h /usr/include/heim_err.h &&
-  ln -sf $HEIMDALINC/k524_err.h /usr/include/k524_err.h &&
-  ln -sf $HEIMDALINC/krb5-protos.h /usr/include/krb5-protos.h
+  default_build
 
 ) > $C_FIFO 2>&1