diff --git a/mozilla/accessible/public/Makefile.in b/mozilla/accessible/public/Makefile.in index e68ce0e59d4..2c9e287b068 100644 --- a/mozilla/accessible/public/Makefile.in +++ b/mozilla/accessible/public/Makefile.in @@ -47,8 +47,5 @@ XPIDLSRCS = \ nsIAccessibleProvider.idl \ $(NULL) -EXPORTS = \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/build/unix/Makefile.in b/mozilla/build/unix/Makefile.in index f5aa84888b7..8707933b3aa 100644 --- a/mozilla/build/unix/Makefile.in +++ b/mozilla/build/unix/Makefile.in @@ -29,9 +29,37 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -export:: - chmod 755 mozilla-config - $(INSTALL) -m 755 mozilla-config $(DIST)/bin +# Hack to make sure that mozilla-config has the proper nspr dependencies +ifdef MOZ_NATIVE_NSPR +FULL_NSPR_CFLAGS=$(shell $(NSPR_CONFIG) --cflags) +FULL_NSPR_LIBS=$(shell $(NSPR_CONFIG) --libs) +else +FULL_NSPR_CFLAGS=-I$(includedir)/nspr +FULL_NSPR_LIBS=$(subst -L$(libdir),-L$(mozappdir),$(shell $(DEPTH)/nsprpub/config/nspr-config --libs)) +endif + +_DEFS = $(subst \",\\\\\",$(ACDEFINES)) + +mozilla-config:: mozilla-config.in Makefile.in Makefile + cat $< | sed \ + -e "s|%prefix%|$(prefix)|" \ + -e "s|%exec_prefix%|$(exec_prefix)|" \ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%libdir%|$(mozappdir)|" \ + -e "s|%DEFS%|$(_DEFS)|" \ + -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ + -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" > $@ + +libs:: mozilla-config + chmod 755 $< + $(INSTALL) -m 755 $< $(DIST)/bin libs:: $(srcdir)/run-mozilla.sh $(INSTALL) $< $(DIST)/bin + +install:: run-mozilla.sh + $(SYSINSTALL) $(IFLAGS2) $< $(DESTDIR)$(mozappdir) + +install:: mozilla-config + $(SYSINSTALL) $(IFLAGS2) $< $(DESTDIR)$(bindir) + diff --git a/mozilla/build/unix/mozilla-config.in b/mozilla/build/unix/mozilla-config.in index 36d798b5b41..448f8d108e4 100755 --- a/mozilla/build/unix/mozilla-config.in +++ b/mozilla/build/unix/mozilla-config.in @@ -1,7 +1,7 @@ #!/bin/sh -prefix=@prefix@ -exec_prefix=@exec_prefix@ +prefix=%prefix% +exec_prefix=%exec_prefix% exec_prefix_set=no usage() @@ -59,8 +59,8 @@ while test $# -gt 0; do exit 0 ;; --cflags) - if test "@includedir@" != /usr/include ; then - includes="-I@includedir@" + if test "%includedir%" != /usr/include ; then + includes="-I%includedir%" fi echo_cflags=yes ;; @@ -95,20 +95,18 @@ if test "$echo_exec_prefix" = "yes"; then fi if test "$echo_defines" = "yes"; then - defines="@DEFS@" - echo $defines + echo %DEFS% fi if test "$echo_cflags" = "yes"; then - cflags="@DEFS@" - nspr_cflags="@FULL_NSPR_CFLAGS@" + nspr_cflags="%FULL_NSPR_CFLAGS%" for n in $echo_components; do - component_includes="$component_includes -I@includedir@/$n" + component_includes="$component_includes -I%includedir%/$n" done echo $component_includes $includes $nspr_cflags fi -_nspr_libs="@FULL_NSPR_LIBS@" +_nspr_libs="%FULL_NSPR_LIBS%" _xpcom_libs="-lxpcom $_nspr_libs" _js_libs="-ljs" @@ -116,21 +114,21 @@ if test "$echo_libs" = "yes"; then for l in $echo_libraries; do case "$l" in gfx) - libs="-lgkgfx $_xpcom_libs" + libs="$libs -lgkgfx $_xpcom_libs" ;; xpcom) - libs="$_xpcom_libs" + libs="$libs $_xpcom_libs" ;; nspr) - libs="$_nspr_libs" + libs="$libs $_nspr_libs" ;; js) - libs="$_js_libs" + libs="$libs $_js_libs" ;; jsj) - libs="-ljsj $_js_libs $_xpcom_libs" + libs="$libs -ljsj $_js_libs $_xpcom_libs" ;; esac done - echo -L@libdir@ $libs + echo -L%libdir% $libs fi diff --git a/mozilla/build/unix/run-mozilla.sh b/mozilla/build/unix/run-mozilla.sh index ce35261a8b7..ebd1698c30e 100755 --- a/mozilla/build/unix/run-mozilla.sh +++ b/mozilla/build/unix/run-mozilla.sh @@ -349,34 +349,37 @@ fi ## Set MOZILLA_FIVE_HOME ## MOZILLA_FIVE_HOME=$MOZ_DIST_BIN -# + +if [ -z "$MRE_HOME" ]; then + MRE_HOME=$MOZILLA_FIVE_HOME +fi ## ## Set LD_LIBRARY_PATH -LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} +LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} if [ -n "$LD_LIBRARYN32_PATH" ] then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} + LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} fi if [ -n "$LD_LIBRARYN64_PATH" ] then - LD_LIBRARYN64_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins${LD_LIBRARYN64_PATH+":$LD_LIBRARYN64_PATH"} + LD_LIBRARYN64_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN64_PATH+":$LD_LIBRARYN64_PATH"} fi if [ -n "$LD_LIBRARY_PATH_64" ]; then - LD_LIBRARY_PATH_64=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins${LD_LIBRARY_PATH_64+":$LD_LIBRARY_PATH_64"} + LD_LIBRARY_PATH_64=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH_64+":$LD_LIBRARY_PATH_64"} fi # # ## Set SHLIB_PATH for HPUX -SHLIB_PATH=${MOZ_DIST_BIN}${SHLIB_PATH+":$SHLIB_PATH"} +SHLIB_PATH=${MOZ_DIST_BIN}:${MRE_HOME}${SHLIB_PATH+":$SHLIB_PATH"} # ## Set LIBPATH for AIX -LIBPATH=${MOZ_DIST_BIN}${LIBPATH+":$LIBPATH"} +LIBPATH=${MOZ_DIST_BIN}:${MRE_HOME}${LIBPATH+":$LIBPATH"} # ## Set DYLD_LIBRARY_PATH for Mac OS X (Darwin) -DYLD_LIBRARY_PATH=${MOZ_DIST_BIN}${DYLD_LIBRARY_PATH+":$DYLD_LIBRARY_PATH"} +DYLD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MRE_HOME}${DYLD_LIBRARY_PATH+":$DYLD_LIBRARY_PATH"} # ## Set LIBRARY_PATH for BeOS -LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/components${LIBRARY_PATH+":$LIBRARY_PATH"} +LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/components:${MRE_HOME}${LIBRARY_PATH+":$LIBRARY_PATH"} # ## Set ADDON_PATH for BeOS ADDON_PATH=${MOZ_DIST_BIN}${ADDON_PATH+":$ADDON_PATH"} diff --git a/mozilla/config/Makefile.in b/mozilla/config/Makefile.in index 143d20d66a8..44959665e85 100644 --- a/mozilla/config/Makefile.in +++ b/mozilla/config/Makefile.in @@ -69,6 +69,10 @@ endif endif include $(topsrcdir)/config/config.mk + +# Do not install util programs +NO_INSTALL=1 + include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH), Linux) diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index 3db3c652dd1..d6a39a33111 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -30,9 +30,14 @@ MOZILLA_VERSION = @MOZILLA_VERSION@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -includedir = @includedir@ +includedir = @includedir@/mozilla-$(MOZILLA_VERSION) libdir = @libdir@ datadir = @datadir@ +mandir = @mandir@ + +mozappdir = $(libdir)/mozilla-$(MOZILLA_VERSION) +mredir = $(libdir)/mre/mre-$(MOZILLA_VERSION) +mrelibdir = $(mredir)/lib DIST = $(DEPTH)/dist diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index b2bf177d1a8..0f08a1b79c6 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -739,6 +739,9 @@ endif endif endif # WINNT +# Use nsinstall in copy mode to install files on the system +SYSINSTALL = $(NSINSTALL) -t + ###################################################################### ### Java Stuff - see common.mk ###################################################################### diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk index 3fbfd150f31..ea969bb3c70 100644 --- a/mozilla/config/rules.mk +++ b/mozilla/config/rules.mk @@ -722,6 +722,59 @@ endif endif # !NO_DIST_INSTALL +$(LOOP_OVER_DIRS) +############################################## +install:: $(SUBMAKEFILES) $(MAKE_DIRS) + +$(LOOP_OVER_DIRS) + +install:: $(EXPORTS) +ifndef NO_INSTALL +ifdef EXPORTS + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE) +endif +endif + +install:: $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) +ifndef NO_INSTALL +#ifdef LIBRARY +#ifndef IS_COMPONENT +#ifdef MRE_DIST +# $(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(DESTDIR)$(mredir) +#else +# $(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(DESTDIR)$(mozappdir) +#endif +#endif # !IS_COMPONENT +#endif # LIBRARY +ifdef SHARED_LIBRARY +ifdef IS_COMPONENT +ifdef MRE_DIST + $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/$(COMPONENTS_PATH) +else + $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/$(COMPONENTS_PATH) +endif +else +ifdef MRE_DIST + $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir) +else + $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir) +endif +endif +endif # SHARED_LIBRARY +ifdef PROGRAM +ifdef MRE_DIST + $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mredir) +else + $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir) +endif +endif # PROGRAM +ifdef SIMPLE_PROGRAMS +ifdef MRE_DIST + $(SYSINSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DESTDIR)$(mredir) +else + $(SYSINSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DESTDIR)$(mozappdir) +endif +endif # SIMPLE_PROGRAMS +endif # NO_INSTALL + checkout: $(MAKE) -C $(topsrcdir) -f client.mk checkout @@ -1274,7 +1327,7 @@ JMC_EXPORT_FILES = $(patsubst %,$(JAVA_DESTPATH)/$(PACKAGE)/%.class,$(JMC_EXPORT # export:: $(JMC_EXPORT_FILES) $(JMCSRCDIR) ifndef NO_DIST_INSTALL - $(NSINSTALL) -t $(IFLAGS1) $(JMC_EXPORT_FILES) $(JMCSRCDIR) + $(SYSINSTALL) $(IFLAGS1) $(JMC_EXPORT_FILES) $(JMCSRCDIR) endif endif # JAVA_OR_NSJVM endif @@ -1347,6 +1400,11 @@ export:: $(PREF_JS_EXPORTS) $(DIST)/bin/defaults/pref ifndef NO_DIST_INSTALL $(INSTALL) $(IFLAGS1) $^ endif + +install:: $(PREF_JS_EXPORTS) +ifndef NO_INSTALL + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/pref +endif endif ################################################################################ # Copy each element of AUTOCFG_JS_EXPORTS to $(DIST)/bin/defaults/autoconfig @@ -1359,6 +1417,11 @@ export:: $(AUTOCFG_JS_EXPORTS) $(DIST)/bin/defaults/autoconfig ifndef NO_DIST_INSTALL $(INSTALL) $(IFLAGS1) $^ endif + +install:: $(AUTOCFG_JS_EXPORTS) +ifndef NO_INSTALL + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/autoconfig +endif endif ################################################################################ # Export the elements of $(XPIDLSRCS) & $(SDK_XPIDLSRCS), @@ -1411,6 +1474,15 @@ libs:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt ifndef NO_DIST_INSTALL $(INSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DIST)/bin/$(COMPONENTS_PATH) endif + +install:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt +ifndef NO_INSTALL +ifdef MRE_DIST + $(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mredir)/$(COMPONENTS_PATH) +else + $(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mozappdir)/$(COMPONENTS_PATH) +endif +endif # NO_INSTALL endif # NO_GEN_XPT GARBAGE_DIRS += $(XPIDL_GEN_DIR) @@ -1452,6 +1524,20 @@ endif endif # SDK_XPIDLSRCS +################################################################################ +# Copy each element of EXTRA_COMPONENTS to $(DIST)/bin/components +ifdef EXTRA_COMPONENTS +libs:: $(EXTRA_COMPONENTS) +ifndef NO_DIST_INSTALL + $(INSTALL) $(IFLAGS2) $^ $(DIST)/bin/components +endif + +install:: $(EXTRA_COMPONENTS) +ifndef NO_INSTALL + $(SYSINSTALL) $(IFLAGS2) $^ $(DESTDIR)$(mozappdir)/components +endif +endif + ################################################################################ # SDK @@ -1486,10 +1572,19 @@ _NO_FLOCK=-l endif libs:: $(CHROME_DEPS) +ifndef NO_DIST_INSTALL @if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(_NO_FLOCK) $(_JAR_AUTO_REG) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(srcdir) < $(JAR_MANIFEST); fi @if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl $(DIST)/bin/chrome $(JAR_MANIFEST) $(_NO_FLOCK); fi +endif + +install:: $(CHROME_DEPS) +ifndef NO_INSTALL + @if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(_NO_FLOCK) $(_JAR_AUTO_REG) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DESTDIR)$(mozappdir)/chrome -s $(srcdir) < $(JAR_MANIFEST); fi + @if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl $(DESTDIR)$(mozappdir)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); fi +endif REGCHROME = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl $(DIST)/bin/chrome/installed-chrome.txt $(_JAR_REGCHROME_DISABLE_JAR) +REGCHROME_INSTALL = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt $(_JAR_REGCHROME_DISABLE_JAR) ############################################################################## diff --git a/mozilla/content/xbl/builtin/Makefile.in b/mozilla/content/xbl/builtin/Makefile.in index 6d95ad70a4d..f4be7854479 100644 --- a/mozilla/content/xbl/builtin/Makefile.in +++ b/mozilla/content/xbl/builtin/Makefile.in @@ -42,3 +42,7 @@ _BUILTINS = htmlBindings.xml libs:: $(_BUILTINS) $(INSTALL) $^ $(DIST)/bin/res/builtin + +install:: $(_BUILTINS) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/builtin + diff --git a/mozilla/content/xbl/builtin/mac/Makefile.in b/mozilla/content/xbl/builtin/mac/Makefile.in index 0aaa07bdc8c..c2b31d1158b 100644 --- a/mozilla/content/xbl/builtin/mac/Makefile.in +++ b/mozilla/content/xbl/builtin/mac/Makefile.in @@ -30,3 +30,7 @@ include $(topsrcdir)/config/rules.mk libs:: $(TARGETS) $(INSTALL) $(srcdir)/platformHTMLBindings.xml $(DIST)/bin/res/builtin + +install:: platformHTMLBindings.xml + $(SYSINSTALL) $(IFLAGS1) $< $(DESTDIR)$(mozappdir)/res/builtin + diff --git a/mozilla/content/xbl/builtin/unix/Makefile.in b/mozilla/content/xbl/builtin/unix/Makefile.in index 0aaa07bdc8c..f3d36be824a 100644 --- a/mozilla/content/xbl/builtin/unix/Makefile.in +++ b/mozilla/content/xbl/builtin/unix/Makefile.in @@ -30,3 +30,6 @@ include $(topsrcdir)/config/rules.mk libs:: $(TARGETS) $(INSTALL) $(srcdir)/platformHTMLBindings.xml $(DIST)/bin/res/builtin + +install:: platformHTMLBindings.xml + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/builtin diff --git a/mozilla/content/xbl/builtin/win/Makefile.in b/mozilla/content/xbl/builtin/win/Makefile.in index 4ade6bcae5b..0f5c345b157 100644 --- a/mozilla/content/xbl/builtin/win/Makefile.in +++ b/mozilla/content/xbl/builtin/win/Makefile.in @@ -35,3 +35,6 @@ include $(topsrcdir)/config/rules.mk libs:: $(BUILTIN_RESOURCES) $(INSTALL) $^ $(DIST)/bin/res/builtin +install:: $(BUILTIN_RESOURCES) + $(INSTALL) $^ $(DESTDIR)$(mozappdir)/res/builtin + diff --git a/mozilla/content/xml/content/src/Makefile.in b/mozilla/content/xml/content/src/Makefile.in index ea1e148cf2f..df09128b5dc 100644 --- a/mozilla/content/xml/content/src/Makefile.in +++ b/mozilla/content/xml/content/src/Makefile.in @@ -69,3 +69,7 @@ EXPORT_RESOURCE_CONTENT = \ $(NULL) libs:: $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd + +install:: + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE_CONTENT) $(DESTDIR)$(mozappdir)/res/dtd + diff --git a/mozilla/directory/xpcom/datasource/Makefile.in b/mozilla/directory/xpcom/datasource/Makefile.in index ed5b875a6f0..1b8fd939ec5 100644 --- a/mozilla/directory/xpcom/datasource/Makefile.in +++ b/mozilla/directory/xpcom/datasource/Makefile.in @@ -38,9 +38,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -JSFILES = $(srcdir)/nsLDAPDataSource.js +EXTRA_COMPONENTS = $(srcdir)/nsLDAPDataSource.js include $(topsrcdir)/config/rules.mk -libs:: - $(INSTALL) $(JSFILES) $(DIST)/bin/components diff --git a/mozilla/embedding/browser/activex/src/control/Makefile.in b/mozilla/embedding/browser/activex/src/control/Makefile.in index 22de832aa17..4b2d356fc1a 100644 --- a/mozilla/embedding/browser/activex/src/control/Makefile.in +++ b/mozilla/embedding/browser/activex/src/control/Makefile.in @@ -110,6 +110,9 @@ LOCAL_INCLUDES += -I. libs:: MozillaControl.html $(INSTALL) $^ $(DIST)/bin/res +install:: MozillaControl.html + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res + export:: $(DEFFILE) done_gen $(DEFFILE): mkctldef.sh diff --git a/mozilla/embedding/components/ui/helperAppDlg/Makefile.in b/mozilla/embedding/components/ui/helperAppDlg/Makefile.in index b23b67ec880..90d170b4f72 100644 --- a/mozilla/embedding/components/ui/helperAppDlg/Makefile.in +++ b/mozilla/embedding/components/ui/helperAppDlg/Makefile.in @@ -30,11 +30,9 @@ XPIDLSRCS = \ nsIHelperAppLauncherDialog.idl \ $(NULL) -JSCOMPONENTS = \ +EXTRA_COMPONENTS = \ nsHelperAppDlg.js \ $(NULL) include $(topsrcdir)/config/rules.mk -libs:: $(JSCOMPONENTS) - $(INSTALL) $^ $(DIST)/bin/components diff --git a/mozilla/embedding/components/ui/progressDlg/Makefile.in b/mozilla/embedding/components/ui/progressDlg/Makefile.in index 60033ba5293..c5df35701cb 100644 --- a/mozilla/embedding/components/ui/progressDlg/Makefile.in +++ b/mozilla/embedding/components/ui/progressDlg/Makefile.in @@ -31,8 +31,7 @@ XPIDLSRCS = \ nsIProgressDialog.idl \ $(NULL) +EXTRA_COMPONENTS = nsProgressDialog.js include $(topsrcdir)/config/rules.mk -libs:: - $(INSTALL) $(srcdir)/nsProgressDialog.js $(DIST)/bin/components diff --git a/mozilla/embedding/tests/mfcembed/Makefile.in b/mozilla/embedding/tests/mfcembed/Makefile.in index 8e423508ba8..a43c6b451d5 100644 --- a/mozilla/embedding/tests/mfcembed/Makefile.in +++ b/mozilla/embedding/tests/mfcembed/Makefile.in @@ -108,3 +108,7 @@ LDFLAGS += -SUBSYSTEM:windows libs:: mfcembed.htm $(INSTALL) $^ $(DIST)/bin + +install:: mfcembed.htm + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir) + diff --git a/mozilla/extensions/ctl/src/pangoLite/Makefile.in b/mozilla/extensions/ctl/src/pangoLite/Makefile.in index c08bc116534..0c9f0aee02b 100755 --- a/mozilla/extensions/ctl/src/pangoLite/Makefile.in +++ b/mozilla/extensions/ctl/src/pangoLite/Makefile.in @@ -71,3 +71,6 @@ EXTRA_DSO_LDOPTS += $(GLIB_GMODULE_LIBS) # Install pango.modules file for Shaping Modules. libs:: $(INSTALL) $(srcdir)/pango.modules $(DIST)/bin + +install:: pango.modules + $(SYSINSTALL) $(IFLAGS1) $< $(DESTDIR)$(mozappdir) diff --git a/mozilla/extensions/inspector/Makefile.in b/mozilla/extensions/inspector/Makefile.in index 494fc6235f7..f7ec5cebcbd 100644 --- a/mozilla/extensions/inspector/Makefile.in +++ b/mozilla/extensions/inspector/Makefile.in @@ -39,3 +39,11 @@ ifeq ($(OS_ARCH),WINNT) $(INSTALL) $(srcdir)/resources/content/res/winInspectorMain.ico $(DIST)/bin/chrome/icons/default endif +install:: + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/res/viewer-registry.rdf $(DESTDIR)$(mozappdir)/res/inspector + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/res/search-registry.rdf $(DESTDIR)$(mozappdir)/res/inspector + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/prefs/inspector.js $(DESTDIR)$(mozappdir)/defaults/pref +ifeq ($(OS_ARCH),WINNT) + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/res/winInspectorMain.ico $(DESTDIR)$(mozappdir)/chrome/icons/default +endif + diff --git a/mozilla/extensions/interfaceinfo/src/Makefile.in b/mozilla/extensions/interfaceinfo/src/Makefile.in index 6469177aeba..3f2f3f7ce92 100644 --- a/mozilla/extensions/interfaceinfo/src/Makefile.in +++ b/mozilla/extensions/interfaceinfo/src/Makefile.in @@ -66,11 +66,11 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ $(NULL) +EXTRA_COMPONENTS = nsInterfaceInfoToIDL.js + include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif -libs:: - $(INSTALL) $(srcdir)/nsInterfaceInfoToIDL.js $(DIST)/bin/components diff --git a/mozilla/extensions/irc/Makefile.in b/mozilla/extensions/irc/Makefile.in index 39936494649..272f93ae723 100644 --- a/mozilla/extensions/irc/Makefile.in +++ b/mozilla/extensions/irc/Makefile.in @@ -34,8 +34,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +EXTRA_COMPONENTS = js/lib/chatzilla-service.js + include $(topsrcdir)/config/rules.mk -libs:: - $(INSTALL) $(srcdir)/js/lib/chatzilla-service.js $(DIST)/bin/components - diff --git a/mozilla/extensions/venkman/Makefile.in b/mozilla/extensions/venkman/Makefile.in index f38a84d5bd8..f7a6f23ed33 100644 --- a/mozilla/extensions/venkman/Makefile.in +++ b/mozilla/extensions/venkman/Makefile.in @@ -40,9 +40,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = resources +EXTRA_COMPONENTS = js/venkman-service.js + include $(topsrcdir)/config/rules.mk -libs:: - $(INSTALL) $(srcdir)/js/venkman-service.js $(DIST)/bin/components - - diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in index 0d2c76c9472..43361af80bd 100644 --- a/mozilla/extensions/wallet/src/Makefile.in +++ b/mozilla/extensions/wallet/src/Makefile.in @@ -80,3 +80,5 @@ include $(topsrcdir)/config/rules.mk libs:: $(INSTALL) $(DEFAULTS_FILES) $(DIST)/bin/defaults/wallet +install:: + $(SYSINSTALL) $(IFLAGS1) $(DEFAULTS_FILES) $(DESTDIR)$(mozappdir)/defaults/wallet diff --git a/mozilla/extensions/webservices/interfaceinfo/src/Makefile.in b/mozilla/extensions/webservices/interfaceinfo/src/Makefile.in index 6469177aeba..3f2f3f7ce92 100644 --- a/mozilla/extensions/webservices/interfaceinfo/src/Makefile.in +++ b/mozilla/extensions/webservices/interfaceinfo/src/Makefile.in @@ -66,11 +66,11 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ $(NULL) +EXTRA_COMPONENTS = nsInterfaceInfoToIDL.js + include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif -libs:: - $(INSTALL) $(srcdir)/nsInterfaceInfoToIDL.js $(DIST)/bin/components diff --git a/mozilla/extensions/xml-rpc/src/Makefile.in b/mozilla/extensions/xml-rpc/src/Makefile.in index 2fe4e709b21..1f4fda83039 100644 --- a/mozilla/extensions/xml-rpc/src/Makefile.in +++ b/mozilla/extensions/xml-rpc/src/Makefile.in @@ -23,11 +23,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -JSFILES = \ +EXTRA_COMPONENTS = \ $(srcdir)/nsDictionary.js \ $(srcdir)/nsXmlRpcClient.js \ include $(topsrcdir)/config/rules.mk -libs:: - $(INSTALL) $(JSFILES) $(DIST)/bin/components diff --git a/mozilla/extensions/xmlextras/interfaceinfo/src/Makefile.in b/mozilla/extensions/xmlextras/interfaceinfo/src/Makefile.in index 6469177aeba..3f2f3f7ce92 100644 --- a/mozilla/extensions/xmlextras/interfaceinfo/src/Makefile.in +++ b/mozilla/extensions/xmlextras/interfaceinfo/src/Makefile.in @@ -66,11 +66,11 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_COMPONENT_LIBS) \ $(NULL) +EXTRA_COMPONENTS = nsInterfaceInfoToIDL.js + include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif -libs:: - $(INSTALL) $(srcdir)/nsInterfaceInfoToIDL.js $(DIST)/bin/components diff --git a/mozilla/extensions/xmlterm/doc/Makefile.in b/mozilla/extensions/xmlterm/doc/Makefile.in index 9bf443b84e8..97f37e3063c 100644 --- a/mozilla/extensions/xmlterm/doc/Makefile.in +++ b/mozilla/extensions/xmlterm/doc/Makefile.in @@ -59,3 +59,7 @@ XMLTERM_DOCS = \ libs:: $(INSTALL) -m 555 $(XMLTERM_DOCS) $(DIST)/bin + +install:: + $(SYSINSTALL) -m 555 $(XMLTERM_DOCS) $(DESTDIR)$(mozappdir) + diff --git a/mozilla/extensions/xmlterm/scripts/Makefile.in b/mozilla/extensions/xmlterm/scripts/Makefile.in index da5bd2a1cb0..f3a3f0d3e17 100644 --- a/mozilla/extensions/xmlterm/scripts/Makefile.in +++ b/mozilla/extensions/xmlterm/scripts/Makefile.in @@ -86,6 +86,9 @@ XMLTERM_SCRIPTS = \ libs:: $(INSTALL) -m 555 $(XMLTERM_SCRIPTS) $(DIST)/bin +install:: + $(SYSINSTALL) -m 555 $(XMLTERM_SCRIPTS) $(DESTDIR)$(mozappdir) + xpi:: zip $(DIST)/bin/$(XPIFILE) install.js cd $(DIST); zip -g bin/$(XPIFILE) \ diff --git a/mozilla/extensions/xmlterm/ui/Makefile.in b/mozilla/extensions/xmlterm/ui/Makefile.in index 33b95a62c17..525f3b27408 100644 --- a/mozilla/extensions/xmlterm/ui/Makefile.in +++ b/mozilla/extensions/xmlterm/ui/Makefile.in @@ -43,11 +43,7 @@ include $(topsrcdir)/config/config.mk include $(srcdir)/../config/xmlterm_config.mk +EXTRA_COMPONENTS = xmlterm-service.js + include $(topsrcdir)/config/rules.mk -## NOTE: Put all the skin stuff in the content directory for the moment -## (Otherwise every Mozilla skin will need to provide an xmlterm skin!) - -libs:: - $(INSTALL) $(srcdir)/xmlterm-service.js $(DIST)/bin/components - diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in index 031221ead54..41799212ee4 100644 --- a/mozilla/gfx/src/Makefile.in +++ b/mozilla/gfx/src/Makefile.in @@ -144,3 +144,6 @@ endif libs:: icon_0.gif icon_1.gif $(INSTALL) -m 555 $^ $(DIST)/bin/res/gfx +install:: icon_0.gif icon_1.gif + $(SYSINSTALL) -m 555 $^ $(DESTDIR)$(mozappdir)/res/gfx + diff --git a/mozilla/gfx/src/ps/Makefile.in b/mozilla/gfx/src/ps/Makefile.in index 6e3939a3724..e00d66e6195 100644 --- a/mozilla/gfx/src/ps/Makefile.in +++ b/mozilla/gfx/src/ps/Makefile.in @@ -84,3 +84,6 @@ CXXFLAGS += $(TK_CFLAGS) libs:: $(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res +install:: + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE) $(DESTDIR)$(mozappdir)/res + diff --git a/mozilla/gfx/src/windows/Makefile.in b/mozilla/gfx/src/windows/Makefile.in index f55c50e04ab..76cb89f0346 100644 --- a/mozilla/gfx/src/windows/Makefile.in +++ b/mozilla/gfx/src/windows/Makefile.in @@ -88,6 +88,9 @@ export:: ../nsCompressedCharMap.cpp libs:: fontEncoding.properties $(INSTALL) $^ $(DIST)/bin/res/fonts +install:: fontEncoding.properties + $(INSTALL) $^ $(DESTDIR)$(mozappdir)/res/fonts + DEFINES += -D_IMPL_NS_GFXNONXP -DWIN32_LEAN_AND_MEAN -DSTRICT EXTRA_DSO_LDOPTS += \ diff --git a/mozilla/htmlparser/tests/outsinks/Makefile.in b/mozilla/htmlparser/tests/outsinks/Makefile.in index 98519f79033..92d54a6dfe7 100644 --- a/mozilla/htmlparser/tests/outsinks/Makefile.in +++ b/mozilla/htmlparser/tests/outsinks/Makefile.in @@ -73,6 +73,10 @@ libs:: $(INSTALL) -m 555 $(srcdir)/TestOutSinks.pl $(DIST)/bin $(INSTALL) $(addprefix $(srcdir)/, $(TEST_FILES)) $(DIST)/bin/OutTestData +install:: + $(SYSINSTALL) -m 555 $(srcdir)/TestOutSinks.pl $(DESTDIR)$(mozappdir) + $(SYSINSTALL) $(addprefix $(srcdir)/, $(TEST_FILES)) $(DESTDIR)$(mozappdir)/OutTestData + ifeq ($(OS_ARCH),WINNT) ifndef GNU_CC LDFLAGS += -SUBSYSTEM:CONSOLE diff --git a/mozilla/intl/locale/src/Makefile.in b/mozilla/intl/locale/src/Makefile.in index d93e05c6999..6420c4f4e06 100644 --- a/mozilla/intl/locale/src/Makefile.in +++ b/mozilla/intl/locale/src/Makefile.in @@ -72,6 +72,9 @@ include $(topsrcdir)/config/rules.mk libs:: $(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res +install:: + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE) $(DESTDIR)$(mozappdir)/res + DEFINES += -D_IMPL_NS_INTL ifeq ($(OS_ARCH),WINNT) diff --git a/mozilla/intl/strres/tests/Makefile.in b/mozilla/intl/strres/tests/Makefile.in index ba4e85c3d32..dc6788faa2b 100644 --- a/mozilla/intl/strres/tests/Makefile.in +++ b/mozilla/intl/strres/tests/Makefile.in @@ -57,3 +57,6 @@ INCLUDES += -I$(srcdir)/../src libs:: $(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res +install:: + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE) $(DESTDIR)$(mozappdir)/res + diff --git a/mozilla/intl/uconv/src/Makefile.in b/mozilla/intl/uconv/src/Makefile.in index 21a061588f0..8a66d583fa8 100644 --- a/mozilla/intl/uconv/src/Makefile.in +++ b/mozilla/intl/uconv/src/Makefile.in @@ -131,3 +131,6 @@ endif libs:: $(EXPORT_RESOURCE) $(INSTALL) $^ $(DIST)/bin/res +install:: $(EXPORT_RESOURCE) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res + diff --git a/mozilla/intl/unicharutil/tables/Makefile.in b/mozilla/intl/unicharutil/tables/Makefile.in index 436e4e35f91..a34d5475a1f 100644 --- a/mozilla/intl/unicharutil/tables/Makefile.in +++ b/mozilla/intl/unicharutil/tables/Makefile.in @@ -39,3 +39,6 @@ _PROP_TABLES = \ libs:: $(_PROP_TABLES) $(INSTALL) $^ $(DIST)/bin/res/entityTables +install:: $(_PROP_TABLES) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/entityTables + diff --git a/mozilla/l10n/langpacks/en-DE/defaults/profile/en-DE/Makefile.in b/mozilla/l10n/langpacks/en-DE/defaults/profile/en-DE/Makefile.in index f11d6612cd2..6e16d482bbf 100644 --- a/mozilla/l10n/langpacks/en-DE/defaults/profile/en-DE/Makefile.in +++ b/mozilla/l10n/langpacks/en-DE/defaults/profile/en-DE/Makefile.in @@ -41,3 +41,6 @@ include $(topsrcdir)/config/rules.mk libs:: $(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/defaults/profile/$(THEME) +install:: + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE) $(DESTDIR)$(mozappdir)/defaults/profile/$(THEME) + diff --git a/mozilla/l10n/langpacks/en-GB/defaults/profile/en-GB/Makefile.in b/mozilla/l10n/langpacks/en-GB/defaults/profile/en-GB/Makefile.in index b33a54082cd..1659e50e504 100644 --- a/mozilla/l10n/langpacks/en-GB/defaults/profile/en-GB/Makefile.in +++ b/mozilla/l10n/langpacks/en-GB/defaults/profile/en-GB/Makefile.in @@ -40,3 +40,6 @@ include $(topsrcdir)/config/rules.mk libs:: $(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/defaults/profile/$(THEME) +install:: + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE) $(DESTDIR)$(mozappdir)/defaults/profile/$(THEME) + diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in index ad914857347..9700b0f3611 100644 --- a/mozilla/layout/html/base/src/Makefile.in +++ b/mozilla/layout/html/base/src/Makefile.in @@ -172,3 +172,7 @@ libs:: $(INSTALL) $(RESOURCES_HTML) $(DIST)/bin/res/html $(INSTALL) $(RESOURCES) $(DIST)/bin/res +install:: + $(SYSINSTALL) $(IFLAGS1) $(RESOURCES_HTML) $(DESTDIR)$(mozappdir)/res/html + $(SYSINSTALL) $(IFLAGS1) $(RESOURCES) $(DESTDIR)$(mozappdir)/res + diff --git a/mozilla/layout/html/document/src/Makefile.in b/mozilla/layout/html/document/src/Makefile.in index 0a043dfd87e..c5d1993e7b2 100644 --- a/mozilla/layout/html/document/src/Makefile.in +++ b/mozilla/layout/html/document/src/Makefile.in @@ -76,7 +76,13 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../../content/src \ $(NULL) -GARBAGE += $(DIST)/bin/res/ua.css $(DIST)/bin/res/html.css $(DIST)/bin/res/forms.css $(DIST)/bin/res/quirk.css $(DIST)/bin/res/viewsource.css $(DIST)/bin/res/arrow.gif $(DIST)/bin/res/arrowd.gif +_FILES = \ + html.css \ + quirk.css \ + viewsource.css \ + arrow.gif \ + arrowd.gif \ + $(NULL) ifeq ($(OS_ARCH),OS2) FORMS_CSS = $(srcdir)/os2/forms.css @@ -84,8 +90,13 @@ else FORMS_CSS = $(srcdir)/forms.css endif -libs:: $(TARGETS) - $(INSTALL) $(srcdir)/html.css $(FORMS_CSS) $(srcdir)/quirk.css $(srcdir)/viewsource.css $(srcdir)/arrow.gif $(srcdir)/arrowd.gif $(DIST)/bin/res +GARBAGE += $(addprefix $(DIST)/bin/res/,$(_FILES)) $(DIST)/bin/res/ua.css + +libs:: $(_FILES) $(FORMS_CSS) + $(INSTALL) $^ $(DIST)/bin/res rm -f $(DIST)/bin/res/ua.css cp $(srcdir)/ua.css $(DIST)/bin/res +install:: $(_FILES) $(FORMS_CSS) ua.css + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res + diff --git a/mozilla/layout/mathml/base/src/Makefile.in b/mozilla/layout/mathml/base/src/Makefile.in index bbd462674f9..6c7bb4be982 100644 --- a/mozilla/layout/mathml/base/src/Makefile.in +++ b/mozilla/layout/mathml/base/src/Makefile.in @@ -110,4 +110,6 @@ _PROPERTIES = \ libs:: $(_PROPERTIES) $(INSTALL) $^ $(DIST)/bin/res/fonts +install:: $(_PROPERTIES) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/fonts diff --git a/mozilla/layout/mathml/content/src/Makefile.in b/mozilla/layout/mathml/content/src/Makefile.in index 0690d2fe914..10c8c4a8e35 100644 --- a/mozilla/layout/mathml/content/src/Makefile.in +++ b/mozilla/layout/mathml/content/src/Makefile.in @@ -61,3 +61,7 @@ EXPORT_RESOURCE_CONTENT = \ libs:: $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd $(INSTALL) $(srcdir)/mathml.css $(DIST)/bin/res + +install:: + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE_CONTENT) $(DESTDIR)$(mozappdir)/res/dtd + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/mathml.css $(DESTDIR)$(mozappdir)/res diff --git a/mozilla/layout/svg/base/src/Makefile.in b/mozilla/layout/svg/base/src/Makefile.in index d4c90555a41..bbfc06b5434 100644 --- a/mozilla/layout/svg/base/src/Makefile.in +++ b/mozilla/layout/svg/base/src/Makefile.in @@ -94,3 +94,6 @@ EXPORT_RESOURCE_CONTENT = \ $(NULL) libs:: $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd + +install:: + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE_CONTENT) $(DESTDIR)$(mozappdir)/res/dtd diff --git a/mozilla/mailnews/absync/public/Makefile.in b/mozilla/mailnews/absync/public/Makefile.in index 2586cc90ad2..da219abb236 100644 --- a/mozilla/mailnews/absync/public/Makefile.in +++ b/mozilla/mailnews/absync/public/Makefile.in @@ -29,9 +29,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = absyncsvc XPIDL_MODULE = absync -EXPORTS = \ - $(NULL) - XPIDLSRCS = \ nsIAbSync.idl \ nsIAbSyncMojo.idl \ diff --git a/mozilla/mailnews/addrbook/Makefile.in b/mozilla/mailnews/addrbook/Makefile.in index 623e531a9c0..624ccc9745f 100644 --- a/mozilla/mailnews/addrbook/Makefile.in +++ b/mozilla/mailnews/addrbook/Makefile.in @@ -28,8 +28,7 @@ include $(DEPTH)/config/autoconf.mk ifdef MOZ_LDAP_XPCOM REQUIRES += mozldap necko -libs:: ./src/nsLDAPPrefsService.js - $(INSTALL) $< $(DIST)/bin/components +EXTRA_COMPONENTS += src/nsLDAPPrefsService.js endif DIRS = public src build diff --git a/mozilla/mailnews/compose/public/Makefile.in b/mozilla/mailnews/compose/public/Makefile.in index ec775acd8a5..62c135cc15b 100644 --- a/mozilla/mailnews/compose/public/Makefile.in +++ b/mozilla/mailnews/compose/public/Makefile.in @@ -31,9 +31,6 @@ ifeq ($(OS_ARCH),WINNT) XPIDL_MODULE = msgcompo endif -EXPORTS = \ - $(NULL) - XPIDLSRCS = \ nsIMsgAttachment.idl \ nsIMsgComposeProgressParams.idl \ diff --git a/mozilla/mailnews/extensions/mdn/Makefile.in b/mozilla/mailnews/extensions/mdn/Makefile.in index 83e46f85fd8..d3a4f0dfa6d 100644 --- a/mozilla/mailnews/extensions/mdn/Makefile.in +++ b/mozilla/mailnews/extensions/mdn/Makefile.in @@ -34,3 +34,8 @@ libs:: $(INSTALL) $(srcdir)/resources/content/mdn.js $(DIST)/bin/defaults/pref @$(REGCHROME) content messenger-mdn messenger.jar @$(REGCHROME) locale en-US/messenger-mdn en-US.jar + +install:: + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/mdn.js $(DESTDIR)$(mozappdir)/defaults/pref + @$(REGCHROME_INSTALL) content messenger-mdn messenger.jar + @$(REGCHROME_INSTALL) locale en-US/messenger-mdn en-US.jar diff --git a/mozilla/mailnews/extensions/mdn/src/Makefile.in b/mozilla/mailnews/extensions/mdn/src/Makefile.in index 549cfe722b4..caba4b59b29 100644 --- a/mozilla/mailnews/extensions/mdn/src/Makefile.in +++ b/mozilla/mailnews/extensions/mdn/src/Makefile.in @@ -56,10 +56,10 @@ EXPORTS = \ nsMsgMdnGenerator.h \ $(NULL) +EXTRA_COMPONENTS = mdn-service.js + # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -libs:: ./mdn-service.js - $(INSTALL) $< $(DIST)/bin/components diff --git a/mozilla/mailnews/extensions/smime/Makefile.in b/mozilla/mailnews/extensions/smime/Makefile.in index 5f182088c72..252e7b84785 100644 --- a/mozilla/mailnews/extensions/smime/Makefile.in +++ b/mozilla/mailnews/extensions/smime/Makefile.in @@ -33,3 +33,5 @@ include $(topsrcdir)/config/rules.mk libs:: $(INSTALL) $(srcdir)/resources/content/smime.js $(DIST)/bin/defaults/pref +install:: + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/smime.js $(DESTDIR)$(mozappdir)/defaults/pref diff --git a/mozilla/mailnews/extensions/smime/public/Makefile.in b/mozilla/mailnews/extensions/smime/public/Makefile.in index 6d69987649f..f06481a59a7 100644 --- a/mozilla/mailnews/extensions/smime/public/Makefile.in +++ b/mozilla/mailnews/extensions/smime/public/Makefile.in @@ -28,9 +28,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = msgsmime -EXPORTS = \ - $(NULL) - XPIDLSRCS = \ nsIMsgSMIMECompFields.idl \ nsIMsgSMIMEHeaderSink.idl \ diff --git a/mozilla/mailnews/extensions/smime/resources/content/Makefile.in b/mozilla/mailnews/extensions/smime/resources/content/Makefile.in index 7df7ae586a1..f7e54794027 100644 --- a/mozilla/mailnews/extensions/smime/resources/content/Makefile.in +++ b/mozilla/mailnews/extensions/smime/resources/content/Makefile.in @@ -29,4 +29,7 @@ include $(DEPTH)/config/autoconf.mk libs:: $(INSTALL) $(srcdir)/smime.js $(DIST)/bin/defaults/pref +install:: + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/smime.js $(DESTDIR)$(mozappdir)/defaults/pref + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/extensions/smime/src/Makefile.in b/mozilla/mailnews/extensions/smime/src/Makefile.in index ab216d17997..cf0419a34d2 100644 --- a/mozilla/mailnews/extensions/smime/src/Makefile.in +++ b/mozilla/mailnews/extensions/smime/src/Makefile.in @@ -50,6 +50,8 @@ EXPORTS = \ nsSMimeJSHelper.h \ $(NULL) +EXTRA_COMPONENTS = smime-service.js + # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 @@ -59,5 +61,3 @@ ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE endif -libs:: ./smime-service.js - $(INSTALL) $< $(DIST)/bin/components diff --git a/mozilla/mailnews/extensions/smoketest/resources/content/Makefile.in b/mozilla/mailnews/extensions/smoketest/resources/content/Makefile.in index 7df7ae586a1..f7e54794027 100644 --- a/mozilla/mailnews/extensions/smoketest/resources/content/Makefile.in +++ b/mozilla/mailnews/extensions/smoketest/resources/content/Makefile.in @@ -29,4 +29,7 @@ include $(DEPTH)/config/autoconf.mk libs:: $(INSTALL) $(srcdir)/smime.js $(DIST)/bin/defaults/pref +install:: + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/smime.js $(DESTDIR)$(mozappdir)/defaults/pref + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/plugin/samples/default/unix/Makefile.in b/mozilla/modules/plugin/samples/default/unix/Makefile.in index e5d43cd7321..34cc87a2fdd 100644 --- a/mozilla/modules/plugin/samples/default/unix/Makefile.in +++ b/mozilla/modules/plugin/samples/default/unix/Makefile.in @@ -64,4 +64,8 @@ endif libs:: install-plugin +ifdef SHARED_LIBRARY +install:: $(SHARED_LIBRARY) + $(SYSINSTALL) $(IFLAGS2) $< $(DESTDIR)$(mozappdir)/plugins +endif diff --git a/mozilla/modules/plugin/samples/default/windows/Makefile.in b/mozilla/modules/plugin/samples/default/windows/Makefile.in index 5beffc40140..047802a9d1c 100644 --- a/mozilla/modules/plugin/samples/default/windows/Makefile.in +++ b/mozilla/modules/plugin/samples/default/windows/Makefile.in @@ -55,6 +55,7 @@ FORCE_SHARED_LIB = 1 FORCE_USE_PIC = 1 NO_DIST_INSTALL = 1 +NO_INSTALL = 1 include $(topsrcdir)/config/rules.mk @@ -68,4 +69,8 @@ endif libs:: install-plugin +install:: $(SHARED_LIBRARY) +ifdef SHARED_LIBRARY + $(SYSINSTALL) $(IFLAGS2) $< $(DESTDIR)$(mozappdir)/plugins +endif diff --git a/mozilla/modules/plugin/samples/simple/Makefile.in b/mozilla/modules/plugin/samples/simple/Makefile.in index eb756dfe9b4..cd7bfc05f89 100644 --- a/mozilla/modules/plugin/samples/simple/Makefile.in +++ b/mozilla/modules/plugin/samples/simple/Makefile.in @@ -38,6 +38,7 @@ REQUIRES = xpcom \ # Make sure that it builds but don't install it NO_DIST_INSTALL = 1 +NO_INSTALL = 1 XPIDLSRCS = nsISimplePluginInstance.idl @@ -59,3 +60,6 @@ CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) $(MOZ_GTK_CFLAGS) libs:: $(INSTALL) $(srcdir)/samples/embed-test.html $(DIST)/bin/res/samples +install:: + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/samples/embed-test.html $(DESTDIR)$(mozappdir)/res/samples + diff --git a/mozilla/netwerk/base/src/Makefile.in b/mozilla/netwerk/base/src/Makefile.in index 39db20e021b..476b9f8c0d5 100644 --- a/mozilla/netwerk/base/src/Makefile.in +++ b/mozilla/netwerk/base/src/Makefile.in @@ -82,7 +82,7 @@ else endif endif -JSFILES = \ +EXTRA_COMPONENTS = \ $(srcdir)/nsProxyAutoConfig.js \ $(NULL) @@ -102,5 +102,3 @@ ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif -libs:: - $(INSTALL) $(JSFILES) $(DIST)/bin/components diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in index 9b40717d864..e89e36903bf 100644 --- a/mozilla/netwerk/test/Makefile.in +++ b/mozilla/netwerk/test/Makefile.in @@ -86,3 +86,7 @@ _RES_FILES = \ libs:: $(_RES_FILES) $(INSTALL) $^ $(DIST)/bin/res + +install:: $(_RES_FILES) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res + diff --git a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in index 98519f79033..92d54a6dfe7 100644 --- a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in +++ b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in @@ -73,6 +73,10 @@ libs:: $(INSTALL) -m 555 $(srcdir)/TestOutSinks.pl $(DIST)/bin $(INSTALL) $(addprefix $(srcdir)/, $(TEST_FILES)) $(DIST)/bin/OutTestData +install:: + $(SYSINSTALL) -m 555 $(srcdir)/TestOutSinks.pl $(DESTDIR)$(mozappdir) + $(SYSINSTALL) $(addprefix $(srcdir)/, $(TEST_FILES)) $(DESTDIR)$(mozappdir)/OutTestData + ifeq ($(OS_ARCH),WINNT) ifndef GNU_CC LDFLAGS += -SUBSYSTEM:CONSOLE diff --git a/mozilla/profile/defaults/Makefile.in b/mozilla/profile/defaults/Makefile.in index 10ba75b271d..5d88a462a66 100644 --- a/mozilla/profile/defaults/Makefile.in +++ b/mozilla/profile/defaults/Makefile.in @@ -41,3 +41,9 @@ FILES := \ libs:: $(FILES) $(INSTALL) $^ $(DIST)/bin/defaults/profile $(INSTALL) $^ $(DIST)/bin/defaults/profile/US + +install:: $(FILES) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/US + + diff --git a/mozilla/profile/defaults/chrome/Makefile.in b/mozilla/profile/defaults/chrome/Makefile.in index 8730609a1e8..1a0d7100580 100644 --- a/mozilla/profile/defaults/chrome/Makefile.in +++ b/mozilla/profile/defaults/chrome/Makefile.in @@ -32,3 +32,8 @@ FILES := $(addprefix $(srcdir)/, $(FILES)) libs:: $(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/chrome $(INSTALL) $(FILES) $(DIST)/bin/defaults/profile/US/chrome + +install:: + $(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/chrome + $(NSINSTALL) -t $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/defaults/profile/US/chrome + diff --git a/mozilla/rdf/resources/Makefile.in b/mozilla/rdf/resources/Makefile.in index 91efa8c2107..abf30bffab3 100644 --- a/mozilla/rdf/resources/Makefile.in +++ b/mozilla/rdf/resources/Makefile.in @@ -50,3 +50,6 @@ include $(topsrcdir)/config/rules.mk libs:: $(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/res/rdf +install:: $(FILES) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/rdf + diff --git a/mozilla/rdf/tests/dsds/Makefile.in b/mozilla/rdf/tests/dsds/Makefile.in index 7463ce57add..ba99d0401db 100644 --- a/mozilla/rdf/tests/dsds/Makefile.in +++ b/mozilla/rdf/tests/dsds/Makefile.in @@ -54,3 +54,6 @@ GARBAGE += $(addprefix $(SAMPLES_DIR)/, $(RESOURCE_SAMPLES)) libs:: $(INSTALL) $(addprefix $(srcdir)/,$(RESOURCE_SAMPLES)) $(SAMPLES_DIR) +install:: $(RESOURCE_SAMPLES) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/samples/rdf + diff --git a/mozilla/security/manager/Makefile.in b/mozilla/security/manager/Makefile.in index 67d22ea46e9..7cce025b12d 100644 --- a/mozilla/security/manager/Makefile.in +++ b/mozilla/security/manager/Makefile.in @@ -115,6 +115,26 @@ endif $(MAKE) -C ssl $@ $(MAKE) -C pki $@ +install:: + $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) +ifdef NSS_3_4 + $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) + $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) + $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) + $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) +endif +ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) +ifneq ($(OS_TEST),i86pc) +ifndef HAVE_64BIT_OS + $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) + $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) +endif +endif +endif + $(MAKE) -C boot $@ + $(MAKE) -C ssl $@ + $(MAKE) -C pki $@ + clean clobber clobber_all realclean distclean depend:: $(MAKE) -C boot $@ $(MAKE) -C ssl $@ diff --git a/mozilla/security/manager/boot/src/Makefile.in b/mozilla/security/manager/boot/src/Makefile.in index 95aa18e4052..6acabd2892f 100644 --- a/mozilla/security/manager/boot/src/Makefile.in +++ b/mozilla/security/manager/boot/src/Makefile.in @@ -51,9 +51,6 @@ MODULE_NAME = BOOT EXPORT_LIBRARY = 1 META_COMPONENT = crypto -EXPORTS = \ - $(NULL) - CPPSRCS = \ nsEntropyCollector.cpp \ nsSecureBrowserUIImpl.cpp \ @@ -91,5 +88,3 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_JS_LIBS) \ $(NULL) -EXTRA_LIBS += \ - $(NULL) diff --git a/mozilla/security/manager/pki/src/Makefile.in b/mozilla/security/manager/pki/src/Makefile.in index 2ae89fc2543..939d2102183 100644 --- a/mozilla/security/manager/pki/src/Makefile.in +++ b/mozilla/security/manager/pki/src/Makefile.in @@ -48,9 +48,6 @@ MODULE_NAME = PKI EXPORT_LIBRARY = 1 META_COMPONENT = crypto -EXPORTS = \ - $(NULL) - CPPSRCS = \ nsNSSDialogs.cpp \ nsPKIModule.cpp \ @@ -83,6 +80,3 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_JS_LIBS) \ $(NULL) -EXTRA_LIBS += \ - $(NULL) - diff --git a/mozilla/security/manager/ssl/src/Makefile.in b/mozilla/security/manager/ssl/src/Makefile.in index f100e6ad8e2..89d77c3d4aa 100644 --- a/mozilla/security/manager/ssl/src/Makefile.in +++ b/mozilla/security/manager/ssl/src/Makefile.in @@ -48,9 +48,6 @@ MODULE_NAME = NSS EXPORT_LIBRARY = 1 META_COMPONENT = crypto -EXPORTS = \ - $(NULL) - CPPSRCS = \ nsNSSCallbacks.cpp \ nsNSSComponent.cpp \ diff --git a/mozilla/webshell/Makefile.in b/mozilla/webshell/Makefile.in index 9b6d399fe66..dbd04596285 100644 --- a/mozilla/webshell/Makefile.in +++ b/mozilla/webshell/Makefile.in @@ -73,3 +73,9 @@ libs:: $(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples $(INSTALL) $(EXPORT_RESOURCE_THROBBER) $(DIST)/bin/res/throbber $(INSTALL) $(srcdir)/tests/viewer/resources/viewer.properties $(DIST)/bin/res + +install:: + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE_SAMPLES) $(DESTDIR)$(mozappdir)/res/samples + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE_THROBBER) $(DESTDIR)$(mozappdir)/res/throbber + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/tests/viewer/resources/viewer.properties $(DESTDIR)$(mozappdir)/res + diff --git a/mozilla/widget/src/gtk/Makefile.in b/mozilla/widget/src/gtk/Makefile.in index b5f48c1a036..ffd8bb09933 100644 --- a/mozilla/widget/src/gtk/Makefile.in +++ b/mozilla/widget/src/gtk/Makefile.in @@ -117,4 +117,6 @@ ICON_FILES = \ libs:: $(INSTALL) $(ICON_FILES) $(DIST)/bin/icons +install:: + $(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons diff --git a/mozilla/widget/src/windows/expose/ISimpleDOMDocument/Makefile.in b/mozilla/widget/src/windows/expose/ISimpleDOMDocument/Makefile.in index aff70432800..6f315d316e5 100644 --- a/mozilla/widget/src/windows/expose/ISimpleDOMDocument/Makefile.in +++ b/mozilla/widget/src/windows/expose/ISimpleDOMDocument/Makefile.in @@ -72,3 +72,7 @@ export:: done_gen libs:: regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY) + +install:: + regsvr32 /s $(DESTDIR)$(mozappdir)/$(SHARED_LIBRARY) + diff --git a/mozilla/widget/src/windows/expose/ISimpleDOMNode/Makefile.in b/mozilla/widget/src/windows/expose/ISimpleDOMNode/Makefile.in index 51e8d8b06de..0983b12cafb 100644 --- a/mozilla/widget/src/windows/expose/ISimpleDOMNode/Makefile.in +++ b/mozilla/widget/src/windows/expose/ISimpleDOMNode/Makefile.in @@ -72,3 +72,7 @@ export:: done_gen libs:: regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY) + +install:: + regsvr32 /s $(DESTDIR)$(mozappdir)/$(SHARED_LIBRARY) + diff --git a/mozilla/xpcom/sample/Makefile.in b/mozilla/xpcom/sample/Makefile.in index b1cb3283b30..9eddf389854 100644 --- a/mozilla/xpcom/sample/Makefile.in +++ b/mozilla/xpcom/sample/Makefile.in @@ -59,6 +59,8 @@ SIMPLE_PROGRAMS = $(TESTCPPSRCS:.cpp=$(BIN_SUFFIX)) include $(topsrcdir)/config/config.mk +EXTRA_COMPONENTS = nsSample.js + # seperate libraries linked in. EXTRA_DSO_LDOPTS = \ $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \ @@ -83,5 +85,7 @@ include $(topsrcdir)/config/rules.mk libs:: $(TARGETS) $(INSTALL) $(srcdir)/xpconnect-sample.html $(DIST)/bin/res/samples - $(INSTALL) $(srcdir)/nsSample.js $(DIST)/bin/components + +install:: $(TARGETS) + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/xpconnect-sample.html $(DESTDIR)$(mozappdir)/res/samples diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in index 9abfd97b131..d51772b39fa 100644 --- a/mozilla/xpcom/tests/Makefile.in +++ b/mozilla/xpcom/tests/Makefile.in @@ -96,3 +96,6 @@ endif libs:: $(INSTALL) $(srcdir)/test.properties $(DIST)/bin/res +install:: + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/test.properties $(DESTDIR)$(mozappdir)/res + diff --git a/mozilla/xpcom/tests/StringFactoringTests/Makefile.in b/mozilla/xpcom/tests/StringFactoringTests/Makefile.in index a367604c131..7b00910bf1a 100644 --- a/mozilla/xpcom/tests/StringFactoringTests/Makefile.in +++ b/mozilla/xpcom/tests/StringFactoringTests/Makefile.in @@ -55,3 +55,6 @@ INCLUDES += -I$(srcdir)/../public -I$(srcdir)/services libs:: $(INSTALL) $(srcdir)/test.properties $(DIST)/bin/res +install:: + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/test.properties $(DESTDIR)$(mozappdir)/res + diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index a60567283e8..dcb7d5e506f 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -248,19 +248,29 @@ CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) LOCAL_INCLUDES = -I$(srcdir) ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) -libs:: mozilla.1 - $(INSTALL) $< $(DIST)/man/man1 - mozilla.1: mozilla.man.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk @sed -e "s|\@bindir\@|${bindir}|" -e "s|\@libdir\@|${libdir}|" \ -e "s|\@mozilla_version\@|${MOZILLA_VERSION}|" < $< > $@ -GARBAGE += mozilla.1 -endif +libs:: mozilla.1 + $(INSTALL) $< $(DIST)/man/man1 -ifeq (,$(filter WINNT OS2,$(OS_ARCH))) -libs:: $(srcdir)/mozilla +install:: mozilla.1 + $(SYSINSTALL) $(IFLAGS) $< $(DESTDIR)$(mandir)/man1 + +mozilla:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk + cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \ + -e "s|%MREDIR%|$(mredir)|" > $@ + chmod +x $@ + +libs:: mozilla $(INSTALL) $< $(DIST)/bin + +install:: mozilla + $(SYSINSTALL) $< $(DESTDIR)$(bindir) + +GARBAGE += mozilla.1 mozilla + endif ifeq ($(MOZ_WIDGET_TOOLKIT),photon) diff --git a/mozilla/xpfe/bootstrap/mozilla b/mozilla/xpfe/bootstrap/mozilla.in similarity index 78% rename from mozilla/xpfe/bootstrap/mozilla rename to mozilla/xpfe/bootstrap/mozilla.in index 2dacfb29ee7..80a95421bfe 100755 --- a/mozilla/xpfe/bootstrap/mozilla +++ b/mozilla/xpfe/bootstrap/mozilla.in @@ -16,7 +16,7 @@ # Reserved. # -## $Id: mozilla,v 1.15 2002-03-20 01:34:25 seawood%netscape.com Exp $ +## $Id: mozilla.in,v 1.1 2002-04-25 02:51:10 seawood%netscape.com Exp $ ## ## Usage: ## @@ -32,13 +32,12 @@ #uncomment for debugging #set -x -#moz_libdir=@libdir@/mozilla +moz_libdir=%MOZAPPDIR% +MRE_HOME=%MREDIR% # honor MOZILLA_FIVE_HOME if it's there if [ -n "$MOZILLA_FIVE_HOME" ] ; then dist_bin="$MOZILLA_FIVE_HOME" -elif [ -d "$moz_libdir" ]; then - dist_bin=$moz_libdir else # Use run-mozilla.sh in the current dir if it exists # If not, then start resolving symlinks until we find run-mozilla.sh @@ -51,26 +50,31 @@ else found=1 else here=`/bin/pwd` - while [ -L "$progname" ]; do - bn=`basename "$progname"` - cd `dirname "$progname"` - progname=`/bin/ls -l "$bn" |sed -e 's/^.* -> //' ` - if [ ! -x "$progname" ]; then - break - fi - curdir=`dirname $progname` + until test $found != 0 -o ! -L "$progname" ; do run_moz="$curdir/run-mozilla.sh" if [ -x $run_moz ]; then dist_bin=$curdir found=1 - break + else + bn=`basename "$progname"` + cd `dirname "$progname"` + progname=`/bin/ls -l "$bn" |sed -e 's/^.* -> //' ` + if [ ! -x "$progname" ]; then + break + fi + curdir=`dirname $progname` fi done cd $here fi if [ $found = 0 ]; then - echo "Cannot find mozilla runtime directory. Exiting." - exit 1 + # Check default compile-time libdir + if [ -x "$moz_libdir/run-mozilla.sh" ]; then + dist_bin=$moz_libdir + else + echo "Cannot find mozilla runtime directory. Exiting." + exit 1 + fi fi fi @@ -106,6 +110,7 @@ do esac done +export MRE_HOME eval "set -- $moreargs" if [ $debugging = 1 ] then diff --git a/mozilla/xpfe/browser/Makefile.in b/mozilla/xpfe/browser/Makefile.in index 37e49252ac6..be0a8e54669 100644 --- a/mozilla/xpfe/browser/Makefile.in +++ b/mozilla/xpfe/browser/Makefile.in @@ -42,3 +42,6 @@ endif libs:: @$(REGCHROME) locale en-US/navigator-platform en-$(CHROME_PLATFORM).jar + +install:: + @$(REGCHROME_INSTALL) locale en-US/navigator-platform en-$(CHROME_PLATFORM).jar diff --git a/mozilla/xpfe/browser/samples/Makefile.in b/mozilla/xpfe/browser/samples/Makefile.in index 27e273008a7..95ccb022f92 100644 --- a/mozilla/xpfe/browser/samples/Makefile.in +++ b/mozilla/xpfe/browser/samples/Makefile.in @@ -45,3 +45,6 @@ include $(topsrcdir)/config/rules.mk libs:: $(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples +install:: + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE_SAMPLES) $(DESTDIR)$(mozappdir)/res/samples + diff --git a/mozilla/xpfe/browser/samples/sampleimages/Makefile.in b/mozilla/xpfe/browser/samples/sampleimages/Makefile.in index ae2518a60ee..028a09793b3 100644 --- a/mozilla/xpfe/browser/samples/sampleimages/Makefile.in +++ b/mozilla/xpfe/browser/samples/sampleimages/Makefile.in @@ -39,3 +39,6 @@ include $(topsrcdir)/config/rules.mk libs:: $(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples/sampleimages +install:: + $(SYSINSTALL) $(IFLAGS1) $(EXPORT_RESOURCE_SAMPLES) $(DESTDIR)$(mozappdir)/res/samples/sampleimages + diff --git a/mozilla/xpfe/communicator/Makefile.in b/mozilla/xpfe/communicator/Makefile.in index 415cc9c44eb..a10b85b12dd 100644 --- a/mozilla/xpfe/communicator/Makefile.in +++ b/mozilla/xpfe/communicator/Makefile.in @@ -42,3 +42,6 @@ endif libs:: @$(REGCHROME) locale en-US/communicator-platform en-$(CHROME_PLATFORM).jar + +install:: + @$(REGCHROME_INSTALL) locale en-US/communicator-platform en-$(CHROME_PLATFORM).jar diff --git a/mozilla/xpfe/communicator/resources/content/Makefile.in b/mozilla/xpfe/communicator/resources/content/Makefile.in index f06b555e030..e3ea1e64d95 100644 --- a/mozilla/xpfe/communicator/resources/content/Makefile.in +++ b/mozilla/xpfe/communicator/resources/content/Makefile.in @@ -41,3 +41,7 @@ include $(topsrcdir)/config/rules.mk libs:: @$(REGCHROME) content communicator comm.jar @$(REGCHROME) locale en-US/communicator en-US.jar + +install:: + @$(REGCHROME_INSTALL) content communicator comm.jar + @$(REGCHROME_INSTALL) locale en-US/communicator en-US.jar diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in b/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in index fe65f67ebcd..c2fc4f051fe 100644 --- a/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in +++ b/mozilla/xpfe/communicator/resources/locale/en-US/Makefile.in @@ -42,3 +42,7 @@ libs:: @$(REGCHROME) content communicator comm.jar @$(REGCHROME) locale en-US/communicator en-US.jar +install:: + @$(REGCHROME_INSTALL) content communicator comm.jar + @$(REGCHROME_INSTALL) locale en-US/communicator en-US.jar + diff --git a/mozilla/xpfe/components/console/Makefile.in b/mozilla/xpfe/components/console/Makefile.in index aff5c6ff38d..7bbdfd93316 100644 --- a/mozilla/xpfe/components/console/Makefile.in +++ b/mozilla/xpfe/components/console/Makefile.in @@ -27,8 +27,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +EXTRA_COMPONENTS = jsconsole-clhandler.js + include $(topsrcdir)/config/rules.mk -libs:: - $(INSTALL) $(srcdir)/jsconsole-clhandler.js $(DIST)/bin/components - diff --git a/mozilla/xpfe/components/download-manager/src/Makefile.in b/mozilla/xpfe/components/download-manager/src/Makefile.in index 045c8aa8562..37d71841f99 100644 --- a/mozilla/xpfe/components/download-manager/src/Makefile.in +++ b/mozilla/xpfe/components/download-manager/src/Makefile.in @@ -46,6 +46,8 @@ CPPSRCS = \ nsDownloadManager.cpp \ $(NULL) +EXTRA_COMPONENTS = nsDownloadProgressListener.js + # we don't want the shared lib, but we want to force the creation of a # static lib. FORCE_STATIC_LIB = 1 @@ -54,5 +56,3 @@ include $(topsrcdir)/config/rules.mk EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) -libs:: - $(INSTALL) $(srcdir)/nsDownloadProgressListener.js $(DIST)/bin/components diff --git a/mozilla/xpfe/components/filepicker/src/Makefile.in b/mozilla/xpfe/components/filepicker/src/Makefile.in index 9e8278b0dd0..728c922d829 100644 --- a/mozilla/xpfe/components/filepicker/src/Makefile.in +++ b/mozilla/xpfe/components/filepicker/src/Makefile.in @@ -47,9 +47,9 @@ CPPSRCS = \ nsWildCard.cpp \ $(NULL) +EXTRA_COMPONENTS = nsFilePicker.js + include $(topsrcdir)/config/rules.mk EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) -libs:: - $(INSTALL) $(srcdir)/nsFilePicker.js $(DIST)/bin/components diff --git a/mozilla/xpfe/components/resetPref/Makefile.in b/mozilla/xpfe/components/resetPref/Makefile.in index d4fec28fc15..656f353b156 100644 --- a/mozilla/xpfe/components/resetPref/Makefile.in +++ b/mozilla/xpfe/components/resetPref/Makefile.in @@ -42,10 +42,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/rules.mk +EXTRA_COMPONENTS = nsResetPref.js -libs:: - $(INSTALL) $(srcdir)/nsResetPref.js $(DIST)/bin/components +include $(topsrcdir)/config/rules.mk clean:: rm -f $(DIST)/bin/components/nsResetPref.js diff --git a/mozilla/xpfe/components/search/datasets/Makefile.in b/mozilla/xpfe/components/search/datasets/Makefile.in index 556ed3d26c8..31fd3348b3c 100644 --- a/mozilla/xpfe/components/search/datasets/Makefile.in +++ b/mozilla/xpfe/components/search/datasets/Makefile.in @@ -46,3 +46,6 @@ include $(topsrcdir)/config/rules.mk libs:: $(FILES) $(INSTALL) $^ $(DIST)/bin/searchplugins +install:: $(FILES) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins + diff --git a/mozilla/xpfe/components/sidebar/src/Makefile.in b/mozilla/xpfe/components/sidebar/src/Makefile.in index 7a0376f6b1b..c22fb8ca6a6 100644 --- a/mozilla/xpfe/components/sidebar/src/Makefile.in +++ b/mozilla/xpfe/components/sidebar/src/Makefile.in @@ -21,7 +21,8 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk + +EXTRA_COMPONENTS = nsSidebar.js + include $(topsrcdir)/config/rules.mk -libs:: - $(INSTALL) $(srcdir)/nsSidebar.js $(DIST)/bin/components diff --git a/mozilla/xpfe/components/updates/src/Makefile.in b/mozilla/xpfe/components/updates/src/Makefile.in index e8d7d7f2fc8..080b8932647 100644 --- a/mozilla/xpfe/components/updates/src/Makefile.in +++ b/mozilla/xpfe/components/updates/src/Makefile.in @@ -41,10 +41,10 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/rules.mk -libs:: - $(INSTALL) $(srcdir)/nsUpdateNotifier.js $(DIST)/bin/components +EXTRA_COMPONENTS = nsUpdateNotifier.js + +include $(topsrcdir)/config/rules.mk clean:: rm -f $(DIST)/bin/components/nsUpdateNotifier.js diff --git a/mozilla/xpfe/global/Makefile.in b/mozilla/xpfe/global/Makefile.in index fee27d84621..d650a3fb0f3 100644 --- a/mozilla/xpfe/global/Makefile.in +++ b/mozilla/xpfe/global/Makefile.in @@ -50,3 +50,6 @@ build.dtd: build.dtd.in $(DEPTH)/config/build_number libs:: @$(REGCHROME) locale en-US/global-platform en-$(CHROME_PLATFORM).jar + +install:: + @$(REGCHROME_INSTALL) locale en-US/global-platform en-$(CHROME_PLATFORM).jar diff --git a/mozilla/xpfe/global/resources/content/Makefile.in b/mozilla/xpfe/global/resources/content/Makefile.in index 1e4c9c9439a..94bfb9e834d 100644 --- a/mozilla/xpfe/global/resources/content/Makefile.in +++ b/mozilla/xpfe/global/resources/content/Makefile.in @@ -41,3 +41,7 @@ include $(topsrcdir)/config/rules.mk libs:: @$(REGCHROME) content global toolkit.jar @$(REGCHROME) locale en-US/global en-US.jar + +install:: + @$(REGCHROME_INSTALL) content global toolkit.jar + @$(REGCHROME_INSTALL) locale en-US/global en-US.jar diff --git a/mozilla/xpinstall/cleanup/Makefile.in b/mozilla/xpinstall/cleanup/Makefile.in index 5e721aa5716..dd9c8994773 100644 --- a/mozilla/xpinstall/cleanup/Makefile.in +++ b/mozilla/xpinstall/cleanup/Makefile.in @@ -74,3 +74,7 @@ endif libs:: $(INSTALL) $(srcdir)/cmessage.txt $(DIST)/bin/res + +install:: + $(SYSINSTALL) $(IFLAGS1) $(srcdir)/cmessage.txt $(DESTDIR)$(mozappdir)/res + diff --git a/mozilla/xpinstall/wizard/os2/GetShortPathName/Makefile.in b/mozilla/xpinstall/wizard/os2/GetShortPathName/Makefile.in index 10f9138c251..c64b2637c19 100644 --- a/mozilla/xpinstall/wizard/os2/GetShortPathName/Makefile.in +++ b/mozilla/xpinstall/wizard/os2/GetShortPathName/Makefile.in @@ -39,6 +39,6 @@ include $(topsrcdir)/config/rules.mk $(MOZTOOLSDIR)/bin: mkdir $(MOZTOOLSDIR)/bin -libs:: $(PROGRAM) +libs install:: $(PROGRAM) cp $(PROGRAM) $(MOZTOOLSDIR)/bin diff --git a/mozilla/xpinstall/wizard/os2/ds32/Makefile.in b/mozilla/xpinstall/wizard/os2/ds32/Makefile.in index c6367216c4f..e6d08478c7e 100644 --- a/mozilla/xpinstall/wizard/os2/ds32/Makefile.in +++ b/mozilla/xpinstall/wizard/os2/ds32/Makefile.in @@ -35,7 +35,7 @@ include $(DEPTH)/config/autoconf.mk MOZTOOLSDIR = $(subst \,/,$(MOZTOOLS)) -libs:: $(PROGRAM) +libs install:: $(PROGRAM) -mkdir $(MOZTOOLSDIR)/bin cp $(PROGRAM) $(MOZTOOLSDIR)/bin diff --git a/mozilla/xpinstall/wizard/os2/nsinstall/Makefile.in b/mozilla/xpinstall/wizard/os2/nsinstall/Makefile.in index a1d3664f5e5..1386a38f0da 100644 --- a/mozilla/xpinstall/wizard/os2/nsinstall/Makefile.in +++ b/mozilla/xpinstall/wizard/os2/nsinstall/Makefile.in @@ -57,3 +57,6 @@ export:: docopy libs:: $(PROGRAM) $(INSTALL) $(PROGRAM) $(DIST)/install +install:: $(PROGRAM) + $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir)/install + diff --git a/mozilla/xpinstall/wizard/os2/nsztool/Makefile.in b/mozilla/xpinstall/wizard/os2/nsztool/Makefile.in index 68ac3b29cb5..73feadafe6b 100644 --- a/mozilla/xpinstall/wizard/os2/nsztool/Makefile.in +++ b/mozilla/xpinstall/wizard/os2/nsztool/Makefile.in @@ -46,3 +46,8 @@ include $(topsrcdir)/config/rules.mk libs:: $(PROGRAM) $(INSTALL) $(PROGRAM) $(DIST)/install $(DIST)/bin/$(MODULE) -g $(DIST)/install/nszip.exe $(DIST)/install/nsinstall.exe + +install:: $(PROGRAM) + $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir)/install + $(DIST)/bin/$(MODULE) -g $(DESTDIR)$(mozappdir)/install/nszip.exe $(DESTDIR)$(mozappdir)/install/nsinstall.exe + diff --git a/mozilla/xpinstall/wizard/os2/ren8dot3/Makefile.in b/mozilla/xpinstall/wizard/os2/ren8dot3/Makefile.in index 62b77a3407c..beb4a11f2b3 100644 --- a/mozilla/xpinstall/wizard/os2/ren8dot3/Makefile.in +++ b/mozilla/xpinstall/wizard/os2/ren8dot3/Makefile.in @@ -36,5 +36,8 @@ include $(DEPTH)/config/autoconf.mk libs:: $(PROGRAM) $(INSTALL) $(PROGRAM) $(DIST)/install +install:: $(PROGRAM) + $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir)/install + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpinstall/wizard/os2/setuprsc/Makefile.in b/mozilla/xpinstall/wizard/os2/setuprsc/Makefile.in index 96ebf766160..1f16253a2bc 100644 --- a/mozilla/xpinstall/wizard/os2/setuprsc/Makefile.in +++ b/mozilla/xpinstall/wizard/os2/setuprsc/Makefile.in @@ -44,3 +44,7 @@ include $(topsrcdir)/config/rules.mk libs:: $(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/install + +install:: + $(SYSINSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/install + diff --git a/mozilla/xpinstall/wizard/os2/uninstall/Makefile.in b/mozilla/xpinstall/wizard/os2/uninstall/Makefile.in index 853111b308b..ed0f0cfe750 100644 --- a/mozilla/xpinstall/wizard/os2/uninstall/Makefile.in +++ b/mozilla/xpinstall/wizard/os2/uninstall/Makefile.in @@ -46,3 +46,7 @@ include $(topsrcdir)/config/rules.mk libs:: $(PROGRAM) $(INSTALL) $(PROGRAM) $(DIST)/install + +install:: $(PROGRAM) + $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir)/install + diff --git a/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in b/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in index 644cb9651f6..ac8005066d1 100644 --- a/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in @@ -43,5 +43,8 @@ include $(topsrcdir)/config/rules.mk libs:: $(PROGRAM) $(INSTALL) $(PROGRAM) $(DIST)/install +install:: $(PROGRAM) + $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir)/install + clean clobber realclean clobber_all:: $(RM) $(DIST)/install/$(PROGRAM) diff --git a/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in b/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in index b1cd9678759..8c86a40a3b2 100644 --- a/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in @@ -45,5 +45,9 @@ libs:: $(PROGRAM) $(INSTALL) $(PROGRAM) $(DIST)/install $(DIST)/install/$(PROGRAM) -g $(DIST)/install/nszip$(BIN_SUFFIX) $(DIST)/install/nsinstall$(BIN_SUFFIX) +install:: $(PROGRAM) + $(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir)/install + $(DIST)/install/$(PROGRAM) -g $(DESTDIR)$(mozappdir)/install/nszip$(BIN_SUFFIX) $(DESTDIR)$(mozappdir)/install/nsinstall$(BIN_SUFFIX) + clean clobber clobber_all realclean:: $(RM) $(DIST)/install/$(PROGRAM) diff --git a/mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in b/mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in index 74dbc9047c4..9fef35b2fe6 100644 --- a/mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in @@ -39,5 +39,8 @@ include $(topsrcdir)/config/rules.mk libs:: $(PROGRAM) $(INSTALL) $(PROGRAM) $(DIST)/install +install:: $(PROGRAM) + $(INSTALL) $(PROGRAM) $(DESTDIR)$(mozappdir)/install + clean clobber realclean clobber_all:: $(RM) $(DIST)/install/$(PROGRAM) diff --git a/mozilla/xpinstall/wizard/windows/setup/Makefile.in b/mozilla/xpinstall/wizard/windows/setup/Makefile.in index ba0ed951d91..7c7f33ff53d 100644 --- a/mozilla/xpinstall/wizard/windows/setup/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/setup/Makefile.in @@ -69,5 +69,8 @@ OS_LIBS += ole32.lib comdlg32.lib shell32.lib version.lib libs:: $(PROGRAM) $(INSTALL) $(PROGRAM) $(DIST)/install +install:: $(PROGRAM) + $(INSTALL) $(PROGRAM) $(DESTDIR)$(mozappdir)/install + clean clobber realclean clobber_all:: $(RM) $(DIST)/install/$(PROGRAM) diff --git a/mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in b/mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in index b95cf4d821b..dd07b6df3f3 100644 --- a/mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in @@ -55,3 +55,6 @@ export:: $(EXPORTS) libs:: $(SHARED_LIBRARY) $(INSTALL) $< $(DIST)/install +install:: $(SHARED_LIBRARY) + $(INSTALL) $< $(DESTDIR)$(mozappdir)/install + diff --git a/mozilla/xpinstall/wizard/windows/uninstall/Makefile.in b/mozilla/xpinstall/wizard/windows/uninstall/Makefile.in index b88ad1c5e33..b80551ff5d6 100644 --- a/mozilla/xpinstall/wizard/windows/uninstall/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/uninstall/Makefile.in @@ -53,6 +53,9 @@ include $(topsrcdir)/config/rules.mk libs:: $(PROGRAM) $(INSTALL) $(PROGRAM) $(DIST)/install +install:: $(PROGRAM) + $(INSTALL) $(PROGRAM) $(DESTDIR)$(mozappdir)/install + clean clobber realclean clobber_all:: $(RM) $(DIST)/install/$(PROGRAM)