diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 45c8854ee95f..1c0df85e8f48 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -156,6 +156,8 @@ JAVA_INCLUDE_PATH=@JAVA_INCLUDE_PATH@ JAVAC=@JAVAC@ JAR=@JAR@ +TAR=@TAR@ + # The MOZ_UI_LOCALE var is used to build a particular locale. Do *not* # use the var to change any binary files. Do *not* use this var unless you # write rules for the "clean-locale" and "locale" targets. diff --git a/configure.in b/configure.in index 242e7128411a..ee47cb6caad5 100644 --- a/configure.in +++ b/configure.in @@ -5467,6 +5467,14 @@ if test -z "$MOZ_XPINSTALL"; then fi AC_SUBST(MOZ_INSTALLER) +AC_MSG_CHECKING([for tar archiver]) +AC_CHECK_PROGS(TAR, gnutar gtar tar, "") +if test -z "$TAR"; then + AC_MSG_ERROR([no tar archiver found in \$PATH]) +fi +AC_MSG_RESULT([$TAR]) +AC_SUBST(TAR) + dnl ======================================================== dnl Updater dnl ======================================================== diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index ba685d1db845..a89daf02e552 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -74,7 +74,8 @@ PACKAGE = $(PKG_BASENAME)$(PKG_SUFFIX) MAKE_PACKAGE = $(error What is a $(MOZ_PKG_FORMAT) package format?); -CREATE_FINAL_TAR = tar -c --owner=0 --group=0 --numeric-owner --mode="go-w" -f +CREATE_FINAL_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \ + --mode="go-w" -f UNPACK_TAR = tar -x ifeq ($(MOZ_PKG_FORMAT),TAR)