bug 751375 - structure webapp runtime Makefiles correctly; r=bsmedberg

This commit is contained in:
Myk Melez 2012-05-07 10:45:53 -07:00
parent e0fc180960
commit e5fd923f3d
2 changed files with 7 additions and 4 deletions

View File

@ -7,14 +7,17 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = $(NULL)
# Include config.mk explicitly so we can override FINAL_TARGET.
include $(topsrcdir)/config/config.mk
# config.mk sets FINAL_TARGET to $(DIST)/bin, but we want to copy build products
# into a WebappRT-specific subdirectory, so we redefine it here.
FINAL_TARGET = $(DIST)/bin/webapprt
DIRS = $(NULL)
ifneq (,$(filter WINNT,$(OS_ARCH)))
DIRS += win
else

View File

@ -7,12 +7,12 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
# shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
NSDISTMODE = copy
include $(topsrcdir)/config/config.mk
PROGRAM = webapprt-stub$(BIN_SUFFIX)
CMMSRCS = webapprt.mm