enable_lib64=yes)
AC_SUBST(enable_lib64)
+AC_ARG_WITH([multiarch],
+[ --with-multiarch=ARCH Specify the multiarch triplet],
+ multiarch=$withval)
+AC_SUBST(multiarch)
+
AC_ARG_ENABLE(librt,
[ --enable-librt=[yes/no] Enable librt support [default=yes]],,
enable_librt=yes)
enable_lib64=no
esac
+#
+# If the user specified a multiarch path then disable lib64
+#
+test -n "$multiarch" && enable_lib64=no
+
#
# Some important tools should be installed into the root partitions.
#
AC_PACKAGE_GLOBALS(xfsprogs)
AC_PACKAGE_UTILITIES(xfsprogs)
AC_MULTILIB($enable_lib64)
+AC_MULTIARCH($multiarch)
AC_RT($enable_librt)
AC_PACKAGE_NEED_INI_H
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
version = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
target ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
configure_options = \
--build=$(DEB_BUILD_GNU_TYPE) \
+ --with-multiarch=$(DEB_HOST_MULTIARCH) \
--host=$(DEB_HOST_GNU_TYPE) \
--disable-ubsan \
--disable-addrsan \
$(pkgme) $(MAKE) dist
install -D -m 0755 debian/local/initramfs.hook debian/xfsprogs/usr/share/initramfs-tools/hooks/xfs
rmdir debian/xfslibs-dev/usr/share/doc/xfsprogs
- rm -f debian/xfslibs-dev/lib/libhandle.la
- rm -f debian/xfslibs-dev/lib/libhandle.a
+ rm -f debian/xfslibs-dev/lib/$(DEB_HOST_MULTIARCH)/libhandle.la
+ rm -f debian/xfslibs-dev/lib/$(DEB_HOST_MULTIARCH)/libhandle.a
rm -fr debian/xfslibs-dev/usr/lib
dh_installdocs -XCHANGES
dh_installchangelogs
PKG_ROOT_SBIN_DIR = @root_sbindir@
PKG_ROOT_LIB_DIR= @root_libdir@@libdirsuffix@
PKG_LIB_DIR = @libdir@@libdirsuffix@
+PKG_LIB_SCRIPT_DIR = @libdir@
PKG_INC_DIR = @includedir@/xfs
DK_INC_DIR = @includedir@/disk
PKG_MAN_DIR = @mandir@
fi
AC_SUBST(libdirsuffix)
])
+
+dnl AC_MULTIARCH creates a variable libdirsuffix containing the suffix of the
+dnl libdir to follow the Debian multiarch spec. (i.e. "/$multiarch")
+AC_DEFUN([AC_MULTIARCH],
+[
+ if test -n "$1"; then
+ libdirsuffix="/$1"
+ AC_MSG_CHECKING([multiarch triplet])
+ AC_MSG_RESULT([$multiarch])
+ fi
+ AC_SUBST(libdirsuffix)
+])
CRONTABS = xfs_scrub_all.cron
OPTIONAL_TARGETS += $(CRONTABS)
# Don't enable the crontab by default for now
-CROND_DIR = $(PKG_LIB_DIR)/$(PKG_NAME)
+CROND_DIR = $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME)
endif
endif # scrub_prereqs
@echo " [SED] $@"
$(Q)$(SED) -e "s|@sbindir@|$(PKG_SBIN_DIR)|g" \
-e "s|@scrub_args@|$(XFS_SCRUB_ARGS)|g" \
- -e "s|@pkg_lib_dir@|$(PKG_LIB_DIR)|g" \
- -e "s|@pkg_name@|$(PKG_NAME)|g" < $< > $@
+ -e "s|@pkg_lib_dir@|$(PKG_LIB_SCRIPT_DIR)|g" \
+ -e "s|@pkg_name@|$(PKG_NAME)|g" \
+ < $< > $@
%.cron: %.cron.in $(builddefs)
@echo " [SED] $@"
install-systemd: default $(SYSTEMD_SERVICES)
$(INSTALL) -m 755 -d $(SYSTEMD_SYSTEM_UNIT_DIR)
$(INSTALL) -m 644 $(SYSTEMD_SERVICES) $(SYSTEMD_SYSTEM_UNIT_DIR)
- $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/$(PKG_NAME)
- $(INSTALL) -m 755 xfs_scrub_fail $(PKG_LIB_DIR)/$(PKG_NAME)
+ $(INSTALL) -m 755 -d $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME)
+ $(INSTALL) -m 755 xfs_scrub_fail $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME)
install-crond: default $(CRONTABS)
$(INSTALL) -m 755 -d $(CROND_DIR)