Build infrastructure updates so that configure options can be used to

specify paths rather than semi-hard-coded path names controlled by the
PREFIX/ROOT_PREFIX environment variables; eg. now allows /lib64 and
/lib32 as alternate library install paths, which some folks need.

10 files changed, 58 insertions, 79 deletions

diff --git a/Makefile b/Makefile
index 5beaa6a..54b27e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000-2001 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of version 2 of the GNU General Public License as
@@ -40,7 +40,7 @@ endif
 CONFIGURE = configure include/builddefs
 LSRCFILES = configure configure.in Makepkgs install-sh README VERSION
 
-LDIRT = config.log config.status config.cache confdefs.h conftest* \
+LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
 	Logs/* built .census install.* install-dev.* *.gz
 
 SUBDIRS = include libdm man doc debian build
@@ -60,7 +60,17 @@ endif
 
 $(CONFIGURE):
 	autoconf
-	./configure
+	./configure \
+		--prefix=/ \
+		--exec-prefix=/ \
+		--sbindir=/bin \
+		--bindir=/usr/bin \
+		--libdir=/lib \
+		--libexecdir=/usr/lib \
+		--includedir=/usr/include \
+		--mandir=/usr/share/man \
+		--datadir=/usr/share \
+		$$LOCAL_CONFIGURE_OPTIONS
 	touch .census
 
 install: default
diff --git a/Makepkgs b/Makepkgs
index e56d754..8d735d8 100755
--- a/Makepkgs
+++ b/Makepkgs
@@ -30,6 +30,7 @@ done
 # start with a clean manifest
 test -f files.rpm && rm -f files.rpm
 test -f filesdevel.rpm && rm -f filesdevel.rpm
+test -f fileslib.rpm && rm -f fileslib.rpm
 
 test ! -d $LOGDIR && mkdir $LOGDIR
 rm -rf $LOGDIR/* > /dev/null 2>&1
@@ -66,11 +67,9 @@ echo
 echo "== configure, log is $LOGDIR/configure"
 rm -f .census	# force configure to run here
 if $verbose ; then
-	autoconf 2>&1 | tee $LOGDIR/configure
-	./configure 2>&1 | tee -a $LOGDIR/configure
+	$MAKE configure 2>&1 | tee $LOGDIR/configure
 else
-	autoconf > $LOGDIR/configure 2>&1 
-	./configure >> $LOGDIR/configure 2>&1 
+	$MAKE configure > $LOGDIR/configure 2>&1 
 fi
 if [ $? -ne 0 ] ; then
 	echo \"configure\" failed, see log in $LOGDIR/configure
diff --git a/VERSION b/VERSION
index d6fb318..a889a92 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=0
-PKG_REVISION=4
+PKG_REVISION=5
 PKG_BUILD=0
diff --git a/build/rpm/dmapi.spec.in b/build/rpm/dmapi.spec.in
index 69abb4c..dafcf92 100644
--- a/build/rpm/dmapi.spec.in
+++ b/build/rpm/dmapi.spec.in
@@ -31,8 +31,6 @@ develop programs which make use of the Data Management API
 (DMAPI).  If you install dmapi-devel, you'll also want to install
 the dmapi (runtime) package and the xfsprogs-devel package.
 
-# If .census exists, then no setup is necessary, just go and do the build,
-# otherwise run setup
 %prep
 if [ -f .census ] ; then
    if [ ! -d ${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION} ] ; then
@@ -40,8 +38,7 @@ if [ -f .census ] ; then
    fi
 else
 %setup
-touch .census
-./configure
+@make@ configure
 fi
 
 %build
diff --git a/configure.in b/configure.in
index 8995d81..4f73bf5 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_SUBST(pkg_name)
 # defaults (to change paths and/or executables, build parameters, etc):
 #
 #   DEBUG  OPTIMIZER  MAKE  CC  LD  TAR  ZIP  RPM  AWK  SED  ECHO
-#   MALLOCLIB  DISTRIBUTION  PACKAGE_BUILDER  PREFIX  ROOT_PREFIX
+#   MALLOCLIB  DISTRIBUTION  PACKAGE_BUILDER
 #
 
 DEBUG=${DEBUG:-'-DDEBUG'}		# -DNDEBUG
@@ -119,63 +119,22 @@ AC_SUBST(libtool)
 
 dnl libtool to build libraries static only?
 AC_ARG_ENABLE(shared,
-	[ --enable-shared=[yes/no]	Enable use of shared libraries [default=yes].],
-	,
+	[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],,
 	enable_shared=yes)
 AC_SUBST(enable_shared)
 
-dnl alternate root and usr prefixes
-test -z "$ROOT_PREFIX" && ROOT_PREFIX=""
-root_prefix="$ROOT_PREFIX"
-test -z "$PREFIX" && PREFIX="/usr"
-prefix="$PREFIX"
-
 dnl man pages (source)
 dnl also check if man page source is gzipped
 dnl (usually on Debian, but not Redhat pre-7.0)
-pkg_man_dir=${prefix}/share/man
 have_zipped_manpages=false
 for d in ${prefix}/share/man ${prefix}/man ; do
     if test -f $d/man1/man.1.gz
     then
-	pkg_man_dir=$d
 	have_zipped_manpages=true
 	break
     fi
 done
-AC_SUBST(pkg_man_dir)
 AC_SUBST(have_zipped_manpages)
 
-dnl binaries
-pkg_bin_dir=${prefix}/bin
-AC_SUBST(pkg_bin_dir)
-
-dnl static libraries
-pkg_lib_dir=${prefix}/lib
-AC_SUBST(pkg_lib_dir)
-
-dnl runtime shared system libraries
-pkg_slib_dir=${root_prefix}/lib
-AC_SUBST(pkg_slib_dir)
-
-dnl system binaries
-pkg_sbin_dir=${root_prefix}/bin
-AC_SUBST(pkg_sbin_dir)
-
-dnl include files
-pkg_inc_dir=${prefix}/include/xfs
-AC_SUBST(pkg_inc_dir)
-
-dnl doc directory
-pkg_doc_dir=${prefix}/share/doc/${pkg_name}
-AC_SUBST(pkg_doc_dir)
-
-
-dnl
-dnl output files
-dnl
-
-AC_OUTPUT( \
-dnl  Build definitions for use in Makefiles
-    include/builddefs \
-)
+dnl build definitions for use in Makefiles
+AC_OUTPUT(include/builddefs)
diff --git a/debian/changelog b/debian/changelog
index cdaf19e..88abff0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dmapi (2.0.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Nathan Scott <nathans@debian.org>  Thu,  4 Jul 2002 12:10:38 +1000
+
 dmapi (2.0.3-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 300e0a6..e12e3f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,7 @@ config: .census
 .census:
 	@echo "== dpkg-buildpackage: configure" 1>&2
 	$(checkdir)
-	autoconf
-	$(options) ./configure
+	$(options) $(MAKE) configure
 	touch .census
 
 clean:
diff --git a/doc/CHANGES b/doc/CHANGES
index 04a45fc..df1c73e 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,9 @@
+dmapi-2.0.5 (04 July 2002)
+	- Build infrastructure updates so that configure options can be
+	  used to specify paths rather than semi-hard-coded path names
+	  controlled by the ROOT/ROOT_PREFIX environment variables; eg.
+	  now allows /lib64 and /lib32
+
 dmapi-2.0.4 (18 June 2002)
 	- kernel<>library interface for DM_OPEN_BY_HANDLE changed
 
diff --git a/include/builddefs.in b/include/builddefs.in
index adda4ae..bc04317 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -39,18 +39,21 @@ DEBUG = @debug_build@
 OPTIMIZER = @opt_build@
 MALLOCLIB = @malloc_lib@
 
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
 PKG_NAME = @pkg_name@
 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_SBIN_DIR = @pkg_sbin_dir@
-PKG_SLIB_DIR = @pkg_slib_dir@
-PKG_INC_DIR = @pkg_inc_dir@
-PKG_MAN_DIR = @pkg_man_dir@
-PKG_DOC_DIR = @pkg_doc_dir@
+PKG_BIN_DIR = @bindir@
+PKG_SBIN_DIR = @sbindir@
+PKG_LIB_DIR = @libdir@
+PKG_DEVLIB_DIR = @libexecdir@
+PKG_INC_DIR = @includedir@/xfs
+PKG_MAN_DIR = @mandir@
+PKG_DOC_DIR = @datadir@/doc/@pkg_name@
 
 CC	= @cc@
 LD	= @ld@
diff --git a/include/buildmacros b/include/buildmacros
index d360443..33b780c 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -72,17 +72,17 @@ LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -D_REENTRANT -fno-strict-aliasing
 
 ifeq ($(ENABLE_SHARED),yes)
-LTLDFLAGS += -rpath $(PKG_SLIB_DIR) 
+LTLDFLAGS += -rpath $(PKG_LIB_DIR) 
 LTLDFLAGS += -version-info $(LTVERSION)
 endif
 
 ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
-	../$(INSTALL) -m 755 -d $(PKG_SLIB_DIR); \
-	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_SLIB_DIR); \
+	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
 	test "$(PKG_DISTRIBUTION)" = debian || \
-	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_SLIB_DIR)
+	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
 endif
 
 # Libtool thinks the static and shared libs should be in the same dir, so
@@ -94,22 +94,22 @@ endif
 ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB_DEV = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
+	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
+	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
 	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-	../$(INSTALL) -m 755 -d $(PKG_SLIB_DIR); \
-	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_SLIB_DIR); \
-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_SLIB_DIR)/$(LIBNAME).a; \
-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_SLIB_DIR)/$(LIBNAME).la; \
-	../$(INSTALL) -S $(PKG_SLIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so
+	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
+	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
 else
 INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
 endif
 
 INSTALL_LTLIB_STATIC = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR)
+	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
+	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR)
 
 INSTALL_MAN = \
 	@for d in $(MAN_PAGES); do \