Bug 854536 Remove GRE_MODULE from Makefile.in's (port bug 852534 and rules.mk of bug 817076). r=Callek

calendar/base/src/Makefile.in

@@ -14,7 +14,6 @@ MODULE           = calbase
 LIBRARY_NAME     = calbase_s
 MODULE_NAME      = calBaseModule
 FORCE_STATIC_LIB = 1
-GRE_MODULE       = 1
 FORCE_USE_PIC   = 1 # Force use of PIC
 USE_STATIC_LIBS = 1
 

calendar/libical/src/libical/Makefile.in

@@ -47,7 +47,6 @@ MODULE           = ical
 LIBRARY_NAME     = mozical
 MODULE_NAME      = mozIcalModule
 FORCE_STATIC_LIB = 1
-GRE_MODULE       = 1
 FORCE_USE_PIC    = 1 # Force use of PIC
 USE_STATIC_LIBS  = 1
 

config/rules.mk

@@ -1283,14 +1283,14 @@ $(foreach namespace,$(EXPORTS_NAMESPACES),$(eval $(EXPORT_NAMESPACE_RULE)))
 ################################################################################
 # Copy each element of PREF_JS_EXPORTS
 
-ifdef GRE_MODULE
-PREF_DIR = greprefs
-else
-ifneq (,$(XPI_NAME)$(LIBXUL_SDK))
-PREF_DIR = defaults/preferences
-else
+# The default location for PREF_JS_EXPORTS is the gre prefs directory.
 PREF_DIR = defaults/pref
-endif
+
+# If DIST_SUBDIR is defined it indicates that app and gre dirs are
+# different and that we are building app related resources. Hence,
+# PREF_DIR should point to the app prefs location.
+ifneq (,$(DIST_SUBDIR)$(XPI_NAME)$(LIBXUL_SDK))
+PREF_DIR = defaults/preferences
 endif
 
 ifneq ($(PREF_JS_EXPORTS),)

db/mork/build/Makefile.in

@@ -21,7 +21,6 @@ MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1
 else
 FORCE_SHARED_LIB = 1
-GRE_MODULE	= 1
 endif
 
 CPPSRCS		= nsMorkFactory.cpp

ldap/xpcom/src/Makefile.in

@@ -21,7 +21,6 @@ MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1
 else
 FORCE_SHARED_LIB = 1
-GRE_MODULE	= 1
 endif
 
 EXTRA_COMPONENTS = \

mailnews/build/Makefile.in

@@ -20,7 +20,6 @@ LIBXUL_LIBRARY	= 1
 else
 FORCE_SHARED_LIB = 1
 endif
-GRE_MODULE	= 1
 FORCE_USE_PIC   = 1
 
 MODULE_NAME	= nsMailModule