зеркало из https://github.com/mozilla/pjs.git
Make sure that all of the headers are installed during a 'make install'.
Thanks to Chris Blizzard <blizzard@mozilla.org> for the patch. Bug #149483 r=cls
This commit is contained in:
Родитель
f247048f2f
Коммит
c6f2d93ac7
|
@ -103,6 +103,17 @@ export:: $(TARGETS) $(HEADERS)
|
|||
-rm -f $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
|
||||
-rm -f $(DIST)/bin/chrome/chromelist.txt
|
||||
|
||||
# we don't use an explicit dependency here because then we would
|
||||
# regenerate nsBuildID.h during the make install phase and that would
|
||||
# be bad.
|
||||
install::
|
||||
@if test ! -f nsBuildID.h; then\
|
||||
echo "You must have done at least a make export before trying to do a make install."; \
|
||||
echo "(nsBuildID.h is missing.)"; \
|
||||
exit 1; \
|
||||
fi;
|
||||
$(SYSINSTALL) $(IFLAGS1) nsBuildID.h $(DESTDIR)$(includedir)
|
||||
|
||||
GARBAGE += build_number nsBuildID \
|
||||
$(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)
|
||||
|
||||
|
|
|
@ -34,6 +34,7 @@ includedir = @includedir@/mozilla-$(MOZILLA_VERSION)
|
|||
libdir = @libdir@
|
||||
datadir = @datadir@
|
||||
mandir = @mandir@
|
||||
idldir = @datadir@/idl/mozilla-$(MOZILLA_VERSION)
|
||||
|
||||
mozappdir = $(libdir)/mozilla-$(MOZILLA_VERSION)
|
||||
mredir = $(libdir)/mre/mre-$(MOZILLA_VERSION)
|
||||
|
|
|
@ -733,6 +733,13 @@ ifdef EXPORTS
|
|||
endif
|
||||
endif
|
||||
|
||||
install:: $(SDK_HEADERS)
|
||||
ifndef NO_INSTALL
|
||||
ifdef SDK_HEADERS
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
|
||||
endif
|
||||
endif
|
||||
|
||||
install:: $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS)
|
||||
ifndef NO_INSTALL
|
||||
#ifdef LIBRARY
|
||||
|
@ -1502,6 +1509,16 @@ ifndef NO_DIST_INSTALL
|
|||
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(notdir $(filter-out $(PUBLIC),$^))
|
||||
endif
|
||||
|
||||
install:: $(XPIDLSRCS)
|
||||
ifndef NO_INSTALL
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(idldir)
|
||||
endif
|
||||
|
||||
install:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS))
|
||||
ifndef NO_INSTALL
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
|
||||
endif
|
||||
|
||||
endif # XPIDLSRCS
|
||||
|
||||
|
||||
|
@ -1545,6 +1562,16 @@ ifndef NO_DIST_INSTALL
|
|||
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(notdir $(filter-out $(SDK_PUBLIC),$^))
|
||||
endif
|
||||
|
||||
install:: $(SDK_XPIDLSRCS)
|
||||
ifndef NO_INSTALL
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(idldir)
|
||||
endif
|
||||
|
||||
install:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(SDK_XPIDLSRCS))
|
||||
ifndef NO_INSTALL
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
|
||||
endif
|
||||
|
||||
endif # SDK_XPIDLSRCS
|
||||
|
||||
################################################################################
|
||||
|
|
Загрузка…
Ссылка в новой задаче