Update build to use nspr.m4. NSPRPUB_CLIENT_BRANCH
authorcls%seawood.org
Sat, 07 Apr 2001 04:34:55 +0000
branchNSPRPUB_CLIENT_BRANCH
changeset 1812 2277fbd64a3ade10c903366ba706cef9a259518f
parent 1811 42d61a1a817c4af58eedb709dab91e3301e54f13
child 1813 9c193b7a4da8851d017d80451980a39d5a0fa5b2
push idunknown
push userunknown
push dateunknown
bugs73919
Update build to use nspr.m4. Start using nspr-config to set NSPR_CFLAGS & NSPR_LIBS. Start placing nspr headers under $(DIST)/include/nspr to match a system installed NSPR. Bug #73919 r=blizzard@mozilla.org
config/Makefile.in
config/autoconf.mk.in
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -117,8 +117,12 @@ export:: $(TARGETS)
 
 $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
 	@$(MAKE_OBJDIR)
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 	$(LD) $(EXEFLAGS) $<
 else
 	$(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@
 endif
+
+real_install:: nspr.m4
+	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
+	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -4,20 +4,21 @@ INCLUDED_AUTOCONF_MK = 1
 USE_AUTOCONF	= 1
 MOZILLA_CLIENT	= @MOZILLA_CLIENT@
 
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 includedir	= @includedir@/nspr
 libdir		= @libdir@
+datadir		= @datadir@
 
 dist_prefix	= @dist_prefix@
 dist_bindir	= @dist_bindir@
-dist_includedir = @dist_includedir@
+dist_includedir = @dist_includedir@/nspr
 dist_libdir	= @dist_libdir@
 
 DIST		= $(dist_prefix)
 
 OBJDIR_NAME	= @OBJDIR_NAME@
 OBJDIR		= @OBJDIR@
 OBJ_SUFFIX	= @OBJ_SUFFIX@
 LIB_SUFFIX	= @LIB_SUFFIX@