From e572fea03331fed7f43390c7fb2805e425b3a8a4 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Sat, 10 Aug 2002 02:01:37 +0000
Subject: [PATCH] try again with getting configure correct on newer autoconf
 versions.

---
 configure.in         | 17 -----------------
 include/builddefs.in | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/configure.in b/configure.in
index 3f72ebf5a..e147d4405 100644
--- a/configure.in
+++ b/configure.in
@@ -43,23 +43,6 @@ pkg_builder=`id -u -n`@`hostname`
 test -z "$PACKAGE_BUILDER" || pkg_builder="$PACKAGE_BUILDER"
 AC_SUBST(pkg_builder)
 
-dnl standard or user-specified install paths
-pkg_bin_dir=${bindir}
-pkg_lib_dir=${libdir}
-pkg_inc_dir=${includedir}/xfs
-pkg_man_dir=${mandir}
-pkg_doc_dir=${datadir}/doc/${pkg_name}
-pkg_sbin_dir=${sbindir}
-pkg_devlib_dir=${libexecdir}
-AC_SUBST(pkg_bin_dir)
-AC_SUBST(pkg_lib_dir)
-AC_SUBST(pkg_inc_dir)
-AC_SUBST(pkg_man_dir)
-AC_SUBST(pkg_doc_dir)
-AC_SUBST(pkg_sbin_dir)
-AC_SUBST(pkg_devlib_dir)
-
-
 dnl output header with cpp defs HAVE_*, etc
 AC_CONFIG_HEADER(include/platform_defs.h)
 
diff --git a/include/builddefs.in b/include/builddefs.in
index 59718e8fe..0a3dce6be 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -45,6 +45,9 @@ LIBXLOG = $(TOPDIR)/libxlog/libxlog.la
 LIBDISK = $(TOPDIR)/libdisk/libdisk.la
 LIBHANDLE = $(TOPDIR)/libhandle/libhandle.la
 
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
 DK_INC_DIR = @includedir@/disk
 
 PKG_NAME = @pkg_name@
@@ -52,13 +55,13 @@ PKG_RELEASE = @pkg_release@
 PKG_VERSION = @pkg_version@
 PKG_DISTRIBUTION = @pkg_distribution@
 PKG_BUILDER = @pkg_builder@
-PKG_BIN_DIR = @pkg_bin_dir@
-PKG_LIB_DIR = @pkg_lib_dir@
-PKG_INC_DIR = @pkg_inc_dir@
-PKG_MAN_DIR = @pkg_man_dir@
-PKG_DOC_DIR = @pkg_doc_dir@
-PKG_SBIN_DIR = @pkg_sbin_dir@
-PKG_DEVLIB_DIR = @pkg_devlib_dir@
+PKG_BIN_DIR = @bindir@
+PKG_LIB_DIR = @libdir@
+PKG_INC_DIR = @includedir@/xfs
+PKG_MAN_DIR = @mandir@
+PKG_DOC_DIR = @datadir@/doc/@pkg_name@
+PKG_SBIN_DIR = @sbindir@
+PKG_DEVLIB_DIR = @libexecdir@
 
 CC	= @cc@
 LD	= @ld@
-- 
2.47.2