On Thu, Aug 08, 2002 at 11:32:42AM +0200, Michael Wahlbrink wrote:
> Does that mean that the 'make install' now work proper and does not
> install the stuff to /man /include .... (regardless the arguments of the
> configure script)????
I've run into the same problem when building my xfs rpms for OpenLinux.
The patch below is my temporary solution. It works fine for me by
backing out the build system changes around 2.1.1.
On ther other hand I don't have to support the braindead lib64 scheme
the LSB commitee insist on..
--- xfsprogs-2.2.0/configure.in.~1~ Thu Aug 8 20:39:09 2002
+++ xfsprogs-2.2.0/configure.in Thu Aug 8 20:40:59 2002
@@ -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
+# MALLOCLIB DISTRIBUTION PACKAGE_BUILDER PREFIX ROOT_PREFIX
#
DEBUG=${DEBUG:-'-DDEBUG'} # -DNDEBUG
@@ -200,18 +200,61 @@ test $ac_cv_sizeof_long -eq 8 && AC_DEFI
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 build definitions for use in Makefiles
-AC_OUTPUT(include/builddefs)
+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 \
+)
--- xfsprogs/include/builddefs.in 2002/04/13 00:11:02 1.22
+++ xfsprogs/include/builddefs.in 2002/07/05 04:16:49 1.21
@@ -32,8 +32,8 @@
# @configure_input@
#
-ifndef _BUILDDEFS_INCLUDED_
-_BUILDDEFS_INCLUDED_ = 1
+ifndef _BUILDMACROS_INCLUDED_
+_BUILDMACROS_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 = @includedir@/disk
+DK_INC_DIR = @dk_inc_dir@
PKG_NAME = @pkg_name@
PKG_RELEASE = @pkg_release@
PKG_VERSION = @pkg_version@
PKG_DISTRIBUTION = @pkg_distribution@
PKG_BUILDER = @pkg_builder@
-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@
+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@
CC = @cc@
LD = @ld@
--- xfsprogs/include/buildmacros 2002/05/14 15:31:38 1.4
+++ xfsprogs/include/buildmacros 2002/07/05 04:16:49 1.3
@@ -72,17 +72,17 @@ LTINSTALL = $(LIBTOOL) --mode=install $(
LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -D_REENTRANT -fno-strict-aliasing
ifeq ($(ENABLE_SHARED),yes)
-LTLDFLAGS += -rpath $(PKG_LIB_DIR)
+LTLDFLAGS += -rpath $(PKG_SLIB_DIR)
LTLDFLAGS += -version-info $(LTVERSION)
endif
ifeq ($(ENABLE_SHARED),yes)
INSTALL_LTLIB = \
cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
+ ../$(INSTALL) -m 755 -d $(PKG_SLIB_DIR); \
+ ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_SLIB_DIR); \
test "$(PKG_DISTRIBUTION)" = debian || \
- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
+ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_SLIB_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) -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
+ ../$(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
else
INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
endif
INSTALL_LTLIB_STATIC = \
cd $(TOPDIR)/$(LIBNAME)/.libs; \
- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR)
+ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR)
INSTALL_MAN = \
@for d in $(MAN_PAGES); do \
|