Commit 246d78d8 authored by benjamin@smedbergs.us's avatar benjamin@smedbergs.us
Browse files

Bug 391271 - Register the GRE during XULRunners "make install" phase, r=luser

parent 2df26b66
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -68,6 +68,18 @@ INSTALL_SDK = 1

include $(topsrcdir)/toolkit/mozapps/installer/packager.mk

$(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile
	printf "[%s]\nGRE_PATH=%s\nxulrunner=true" $(MOZILLA_VERSION) $(installdir)> $@

ifndef SKIP_GRE_REGISTRATION
# to register xulrunner per-user, override this with $HOME/.gre.d
regdir = /etc/gre.d

install:: $(MOZILLA_VERSION).system.conf
	$(NSINSTALL) -D $(DESTDIR)$(regdir)
	$(SYSINSTALL) $^ $(DESTDIR)$(regdir)
endif

# Add pkg-config files to the install:: target

pkg_config_files = \
@@ -112,4 +124,6 @@ install:: $(pkg_config_files)
	@echo pkg_config_file: $(pkg_config_files)
	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig

GARBAGE += $(MOZILLA_VERSION).system.conf $(pkg_config_files)

libs:: make-sdk