diff options
| author | cls%seawood.org <devnull@localhost> | 2001-04-07 04:34:55 +0000 |
|---|---|---|
| committer | cls%seawood.org <devnull@localhost> | 2001-04-07 04:34:55 +0000 |
| commit | 2695aa1e1a2ae0ec6e923033c032cfae9bd71969 (patch) | |
| tree | 89600f3f91c229c630582fa373eb10100e364231 | |
| parent | b591f29ab401ab9b62c07eee5cabd4f590f72148 (diff) | |
| download | nspr-hg-2695aa1e1a2ae0ec6e923033c032cfae9bd71969.tar.gz | |
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
| -rw-r--r-- | config/Makefile.in | 4 | ||||
| -rw-r--r-- | config/autoconf.mk.in | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config/Makefile.in b/config/Makefile.in index e7caa407..1797754c 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -122,3 +122,7 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP) else $(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@ endif + +real_install:: nspr.m4 + $(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal + $(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 9d493d9a..9ac9c31e 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -9,10 +9,11 @@ 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) |