Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename real_install target as install.

Browse Source 
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
This commit is contained in:
cls%seawood.org
2005-11-23 06:35:20 +00:00
parent 6831b70b68
commit e14879c7b0
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/nsprpub/config/Makefile.in
View File

@@ -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

18
mozilla/nsprpub/config/rules.mk
View File

@@ -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

1
mozilla/nsprpub/lib/msgc/tests/Makefile.in
View File

@@ -310,6 +310,5 @@ endif
endif
export:: $(TARGETS)
export:: install
clean::
rm -f $(TARGETS)

2
mozilla/nsprpub/lib/tests/windows/makefile
View File

@@ -80,7 +80,5 @@ $(OBJDIR)/winevent.exe: $(OBJS)
export:: $(TARGETS)
install:: export
clean::
rm -rf $(TARGETS)