From a7f7a55b7b3fc2ff19f5ff20a57f9237a74cfeda Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Wed, 23 Nov 2005 06:31:55 +0000 Subject: [PATCH] NSPR's real_install target has been renamed to install. Bug #304239 r=wtc git-svn-id: svn://10.0.0.236/trunk@185191 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/Makefile.in | 2 +- mozilla/config/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in index 31675f8a57d..e58e1f90a66 100644 --- a/mozilla/Makefile.in +++ b/mozilla/Makefile.in @@ -480,7 +480,7 @@ endif install:: ifndef MOZ_NATIVE_NSPR - $(MAKE) -C nsprpub real_install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nspr + $(MAKE) -C nsprpub install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nspr $(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4)) $(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties) endif diff --git a/mozilla/config/Makefile.in b/mozilla/config/Makefile.in index 04e102663cd..55718e7828f 100644 --- a/mozilla/config/Makefile.in +++ b/mozilla/config/Makefile.in @@ -128,7 +128,7 @@ endif endif libs:: _ABS_DIST=`$(ABS_DIST)`; \ - $(MAKE) -C $(DEPTH)/nsprpub real_install prefix=$$_ABS_DIST/sdk exec_prefix=$$_ABS_DIST/sdk bindir=$$_ABS_DIST/sdk/dummy includedir=$$_ABS_DIST/sdk/include libdir=$$_ABS_DIST/sdk/lib datadir=$$_ABS_DIST/sdk/dummy DESTDIR= + $(MAKE) -C $(DEPTH)/nsprpub install prefix=$$_ABS_DIST/sdk exec_prefix=$$_ABS_DIST/sdk bindir=$$_ABS_DIST/sdk/dummy includedir=$$_ABS_DIST/sdk/include libdir=$$_ABS_DIST/sdk/lib datadir=$$_ABS_DIST/sdk/dummy DESTDIR= $(RM) -rf $(DIST)/sdk/dummy ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) $(RM) -f $(DIST)/sdk/lib/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plc4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plds4$(DLL_SUFFIX)