Add 'make install' target to build. It's "MRE-friendly". (See http://www.mozilla.org/projects/embedding/MRE.html for details.)

Changes:
* Added EXTRA_COMPONENTS variable to build.  Use it to automagically install files into the components dir.
* Added SYSINSTALL variable.  Use it install files onto the system.
* Move mozilla-config generation from configure to makefiles
* mozilla-config will now generate paths based upon the MRE-based directory layout.
* Generate mozilla script from template

The installation heirarchy currently looks like:
$prefix -> /bin/mozilla
           /bin/mozilla-config
           /include/mozilla-ver/*
           /lib/mozilla-ver  (mozappdir)
                            /components
                            /res
                            /defaults
                            /chrome

There is preliminary build support for MRE dirs as well though the component manager hasn't had MRE support added yet.

$prefix -> /lib/mre/mre-ver  (mredir)
                            /components

Bug #56601 r=leaf
This commit is contained in:
seawood%netscape.com 2002-04-25 20:40:00 +00:00
Родитель 81dcaa0ff8
Коммит 0db1ea6b9e
3 изменённых файлов: 11 добавлений и 14 удалений

Просмотреть файл

@ -290,6 +290,17 @@ ifdef MOZ_ENABLE_XFT
$(MAKE) freetype
$(MAKE) expat
endif
install::
ifndef MOZ_NATIVE_NSPR
$(MAKE) -C nsprpub real_install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nspr
$(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4))
$(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties)
endif
ifdef MOZ_LDAP_XPCOM
$(MAKE) -C directory/c-sdk real_install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/ldap
endif
endif
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -47,7 +47,6 @@ add_makefiles "
Makefile
build/Makefile
build/unix/Makefile
build/unix/mozilla-config
config/Makefile
config/autoconf.mk
config/mkdepend/Makefile

Просмотреть файл

@ -4588,19 +4588,6 @@ if test -z "$MOZ_NATIVE_NSPR"; then
rm -f config/autoconf.mk.bak
fi
# Hack to make sure that mozilla-config has the proper nspr dependencies
if test -z "$MOZ_NATIVE_NSPR"; then
FULL_NSPR_CFLAGS=`./nsprpub/config/nspr-config --cflags`
FULL_NSPR_LIBS=`./nsprpub/config/nspr-config --libs`
else
FULL_NSPR_CFLAGS=`${NSPR_CONFIG} --cflags`
FULL_NSPR_LIBS=`${NSPR_CONFIG} --libs`
fi
mv build/unix/mozilla-config build/unix/mozilla-config.bak
cat build/unix/mozilla-config.bak | sed -e "s|@FULL_NSPR_LIBS@|${FULL_NSPR_LIBS}|" -e "s|@FULL_NSPR_CFLAGS@|${FULL_NSPR_CFLAGS}|" > build/unix/mozilla-config
rm -f build/unix/mozilla-config.bak
# if we're building the LDAP XPCOM component, we need to build
# the c-sdk first.
#