From e14879c7b07f4e1be662c857fab31d638ed57e59 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 23 Nov 2005 06:35:20 +0000
Subject: [PATCH] Rename real_install target as install. Thanks to Wan-Teh
 Chang <wtchang@redhat.com> for the patch. Bug #304239 r=cls

git-svn-id: svn://10.0.0.236/branches/NSPRPUB_PRE_4_2_CLIENT_BRANCH@185192 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/nsprpub/config/Makefile.in         |  2 +-
 mozilla/nsprpub/config/rules.mk            | 18 +++++++++---------
 mozilla/nsprpub/lib/msgc/tests/Makefile.in |  1 -
 mozilla/nsprpub/lib/tests/windows/makefile |  2 --
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/mozilla/nsprpub/config/Makefile.in b/mozilla/nsprpub/config/Makefile.in
index 890f8c6b57e..cbed0d6a863 100644
--- a/mozilla/nsprpub/config/Makefile.in
+++ b/mozilla/nsprpub/config/Makefile.in
@@ -155,6 +155,6 @@ else
 	$(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
 endif
 
-real_install:: nspr.m4
+install:: nspr.m4
 	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
 	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal
diff --git a/mozilla/nsprpub/config/rules.mk b/mozilla/nsprpub/config/rules.mk
index 492e0aebdb3..b0db541d2f0 100644
--- a/mozilla/nsprpub/config/rules.mk
+++ b/mozilla/nsprpub/config/rules.mk
@@ -37,16 +37,18 @@
 # ***** END LICENSE BLOCK *****
 
 ################################################################################
-# We have a 4 pass build process:
+# We used to have a 4 pass build process.  Now we do everything in one pass.
 #
-# Pass 1. export - Create generated headers and stubs. Publish public headers to
-#		dist/<arch>/include.
+# export - Create generated headers and stubs. Publish public headers to
+#          dist/<arch>/include.
+#          Create libraries. Publish libraries to dist/<arch>/lib.
+#          Create programs. 
 #
-# Pass 2. libs - Create libraries. Publish libraries to dist/<arch>/lib.
+# libs - obsolete.  Now a synonym of "export".
 #
-# Pass 3. all - Create programs. 
+# all - the default makefile target.  Now a synonym of "export".
 #
-# Pass 4. install - Publish programs to dist/<arch>/bin.
+# install - Install headers, libraries, and programs on the system.
 #
 # Parameters to this makefile (set these before including):
 #
@@ -205,8 +207,6 @@ export::
 
 libs:: export
 
-install:: export
-
 clean::
 	rm -rf $(OBJS) $(RES) so_locations $(NOSUCHFILE) $(GARBAGE)
 	+$(LOOP_OVER_DIRS)
@@ -223,7 +223,7 @@ distclean::
 	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
 	+$(LOOP_OVER_DIRS)
 
-real_install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
 ifdef RELEASE_BINS
 	$(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
 endif
diff --git a/mozilla/nsprpub/lib/msgc/tests/Makefile.in b/mozilla/nsprpub/lib/msgc/tests/Makefile.in
index 609bdf6be90..b447f76826d 100644
--- a/mozilla/nsprpub/lib/msgc/tests/Makefile.in
+++ b/mozilla/nsprpub/lib/msgc/tests/Makefile.in
@@ -310,6 +310,5 @@ endif
 endif
 
 export:: $(TARGETS)
-export:: install
 clean::
 	rm -f $(TARGETS)
diff --git a/mozilla/nsprpub/lib/tests/windows/makefile b/mozilla/nsprpub/lib/tests/windows/makefile
index 5441da0ac36..32b9e30a5d1 100644
--- a/mozilla/nsprpub/lib/tests/windows/makefile
+++ b/mozilla/nsprpub/lib/tests/windows/makefile
@@ -80,7 +80,5 @@ $(OBJDIR)/winevent.exe: $(OBJS)
 
 export:: $(TARGETS)
 
-install:: export
-
 clean::
 	rm -rf $(TARGETS)