Bug 1744857 - Remove MOZ_FS_LAYOUT. r=firefox-build-system-reviewers,mhentges

It's consistently set to bundle for all Darwin targets, and that's the
only value we really care about. Removing MOZ_FS_LAYOUT reduces the
differences between old-configure and js/src/old-configure one tiny bit.

Differential Revision: https://phabricator.services.mozilla.com/D133150

browser/installer/Makefile.in

@@ -120,7 +120,7 @@ MOZ_PACKAGER_MINIFY=1
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
-ifeq (bundle, $(MOZ_FS_LAYOUT))
+ifeq (Darwin,$(OS_TARGET))
 BINPATH = $(_BINPATH)
 DEFINES += -DAPPNAME='$(_APPNAME)'
 else

mobile/android/installer/Makefile.in

@@ -63,7 +63,7 @@ endif
 endif
 endif
 
-ifeq (bundle, $(MOZ_FS_LAYOUT))
+ifeq (Darwin,$(OS_TARGET))
 BINPATH = $(_BINPATH)
 DEFINES += -DAPPNAME=$(_APPNAME)
 else

old-configure.in

@@ -221,8 +221,6 @@ MOZ_USER_DIR=".mozilla"
 
 MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib"
 
-MOZ_FS_LAYOUT=unix
-
 dnl Configure platform-specific CPU architecture compiler options.
 dnl ==============================================================
 if test "$COMPILE_ENVIRONMENT"; then
@@ -1280,7 +1278,6 @@ cocoa)
     CFLAGS="$CFLAGS $TK_CFLAGS"
     CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
     MOZ_USER_DIR="Mozilla"
-    MOZ_FS_LAYOUT=bundle
     ;;
 
 uikit)
@@ -1290,7 +1287,6 @@ uikit)
     CFLAGS="$CFLAGS $TK_CFLAGS"
     CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
     MOZ_USER_DIR="Mozilla"
-    MOZ_FS_LAYOUT=bundle
     ;;
 
 esac
@@ -1323,8 +1319,6 @@ if test "$COMPILE_ENVIRONMENT"; then
   fi
 fi # COMPILE_ENVIRONMENT
 
-AC_SUBST(MOZ_FS_LAYOUT)
-
 AC_SUBST_LIST(TK_CFLAGS)
 AC_SUBST_LIST(TK_LIBS)
 

toolkit/mozapps/installer/packager.mk

@@ -145,10 +145,7 @@ endif
 
 # The install target will install the application to prefix/lib/appname-version
 install:: prepare-package
-ifeq ($(OS_ARCH),WINNT)
-	$(error "make install" is not supported on this platform. Use "make package" instead.)
-endif
-ifeq (bundle,$(MOZ_FS_LAYOUT))
+ifneq (,$(filter WINNT Darwin,$(OS_TARGET)))
 	$(error "make install" is not supported on this platform. Use "make package" instead.)
 endif
 	$(NSINSTALL) -D $(DESTDIR)$(installdir)