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.

diff --git a/Makefile b/Makefile
index bd697ba42d268ad8cbb8b93482a4f4fdfe04a95f..b37c0b95448185c7e28d5297f923565ec12bf67b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ endif
 CONFIGURE = configure include/builddefs include/platform_defs.h
 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 libxfs libxlog libhandle libdisk \
@@ -62,7 +62,17 @@ endif
 
 $(CONFIGURE):
        autoconf
-       ./configure
+       ./configure \
+               --prefix=/ \
+               --exec-prefix=/ \
+               --sbindir=/sbin \
+               --bindir=/usr/sbin \
+               --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 e56d754b5df2a8d48ef5eb974646a8a479b820b1..8d735d815a7868a15d71fe3d9d79f7528ccdb4b8 100755 (executable)
--- 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 c82d8cc183fb07482b05b30e9af11817664d2527..f538babb1caea6dad219bbd9d2af695792836d66 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=1
-PKG_REVISION=0
+PKG_REVISION=1
 PKG_BUILD=0

diff --git a/build/rpm/xfsprogs.spec.in b/build/rpm/xfsprogs.spec.in
index e97a4686fbea9b870793300ec388fced586ef2a0..98dae4adcc14eaf16bbde0985354c62c0c036c40 100644 (file)
--- a/build/rpm/xfsprogs.spec.in
+++ b/build/rpm/xfsprogs.spec.in
@@ -43,8 +43,6 @@ You should install xfsprogs-devel if you want to develop XFS
 filesystem-specific programs,  If you install xfsprogs-devel, you'll
 also want to install xfsprogs.
 
-# 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
@@ -52,8 +50,7 @@ if [ -f .census ] ; then
    fi
 else
 %setup
-touch .census
-./configure
+@make@ configure
 fi
 
 %build

diff --git a/configure.in b/configure.in
index 868043049e1a8aa7448bfebca8a18e6e0d92dcbe..c614aa59e9b473242125230b4c17b6ba6086595a 100644 (file)
--- 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
@@ -77,6 +77,11 @@ test -z "$RPM" && AC_PATH_PROG(RPM, rpm, /bin/rpm)
 rpm=$RPM
 AC_SUBST(rpm)
 
+dnl check if the msgfmt program is available
+test -z "$MSGFMT" && AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt)
+msgfmt=$MSGFMT
+AC_SUBST(msgfmt)
+
 dnl .. and what version is rpm
 rpm_version=0
 test -x $RPM && \
@@ -115,8 +120,7 @@ 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)
 
@@ -183,61 +187,18 @@ test $ac_cv_sizeof_long -eq 8 && AC_DEFINE(HAVE_64BIT_LONG)
 test $ac_cv_sizeof_char_p -eq 4 && AC_DEFINE(HAVE_32BIT_PTR)
 test $ac_cv_sizeof_char_p -eq 8 && AC_DEFINE(HAVE_64BIT_PTR)
 
-
-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}/sbin
-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}/sbin
-AC_SUBST(pkg_sbin_dir)
-
-dnl include files
-pkg_inc_dir=${prefix}/include/xfs
-AC_SUBST(pkg_inc_dir)
-dk_inc_dir=${prefix}/include/disk
-AC_SUBST(dk_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 7b3ad135d7afa74ba90c78873f64c8004b5f4c38..ef98e9e87ba0c2ab4aa428d5a276ee91dcec4ebf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfsprogs (2.1.1-1) unstable; urgency=low
+
+  * New upstream release (build-related changes only)
+
+ -- Nathan Scott <nathans@debian.org>  Thu,  4 Jul 2002 12:10:38 +1000
+
 xfsprogs (2.1.0-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/rules b/debian/rules
index acf96678a93174b52a006e777de2b7e5b0d2d26f..d4aab4dced819c46b6537b4af6a798d5e4caf322 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ pkgbfs = DIST_ROOT=`pwd`/$(dirbfs); export DIST_ROOT;
 stdenv = @GZIP=-q; export GZIP;
 
 options = DEBUG=-DNDEBUG; DISTRIBUTION=debian; export DEBUG DISTRIBUTION;
-bfsopts = $(options) OPTIMIZER=-Os; export OPTIMIZER;
+bfsopts = OPTIMIZER=-Os; LOCAL_CONFIGURE_OPTIONS=--enable-shared-uuid=yes; \
+         $(options) export OPTIMIZER LOCAL_CONFIGURE_OPTIONS;
 checkdir = test -f debian/rules
 
 build: built
@@ -26,16 +27,14 @@ config: .census
 .census:
        @echo "== dpkg-buildpackage: configure" 1>&2
        $(checkdir)
-       autoconf
-       $(options) ./configure
+       $(options) $(MAKE) configure
        touch .census
 
 bfbuild: 
        $(checkdir)
        @echo "== dpkg-buildpackage: bootfloppies" 1>&2
        if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \
-               autoconf; \
-               $(bfsopts) ./configure --enable-shared-uuid=yes; \
+               $(bfsopts) $(MAKE) configure; \
                for dir in libxfs libdisk mkfs; do $(MAKE) -C $$dir; done; \
                mv mkfs/mkfs.xfs mkfs/mkfs.xfs-$(bootpkg); \
                $(MAKE) distclean; \

diff --git a/doc/CHANGES b/doc/CHANGES
index c533118d8a364ed8d3d79d9b9c0ddc24059d2724..ddc3442d16c9a1149f587c5d3c838dbc713d70ce 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,10 @@
-xfsprogs-2.1.0 (14 Jun 2002)
+xfsprogs-2.1.1 (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
+
+xfsprogs-2.1.0 (14 June 2002)
        - support for xfs version 2 log format.
        - Fix for xfs_repair mangling i8count for dir2_sf directories
        - Minor mkfs.xfs man page update for blocksize limits on Linux

diff --git a/include/builddefs.in b/include/builddefs.in
index 66fe60f3f64f7b0db6046e9fc8686349952f2a15..5bb90ab9ccafc3738942aea912682ed87c0e7014 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -32,8 +32,8 @@
 # @configure_input@
 #
 
-ifndef _BUILDMACROS_INCLUDED_
-_BUILDMACROS_INCLUDED_ = 1
+ifndef _BUILDDEFS_INCLUDED_
+_BUILDDEFS_INCLUDED_ = 1
 
 DEBUG = @debug_build@
 OPTIMIZER = @opt_build@
@@ -45,20 +45,20 @@ LIBXLOG = $(TOPDIR)/libxlog/libxlog.la
 LIBDISK = $(TOPDIR)/libdisk/libdisk.la
 LIBHANDLE = $(TOPDIR)/libhandle/libhandle.la
 
-DK_INC_DIR = @dk_inc_dir@
+DK_INC_DIR = @includedir@/disk
 
 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 d36044338899b6f509ee29cab9c4f74fb086f6aa..33b780c0c7a68355f9007787fddb3755ad722f8f 100644 (file)
--- 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 \