Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 158704: 1. Added comments explaining why we need to install an

Browse Source 
additional copy of libnspr_flt4.so in pr/src/cpu/sparcv8plus if the
libnspr4.so installed in dist/lib is a symbolic link.
Modified files: pr/src/Makefile.in, pr/src/md/unix/Makefile.in
2. Made the 'release' and 'real_install' makefile targets install
libnspr_flt4.so in the cpu/sparcv8plus subdirectory of lib.
Modified files: config/rules.mk pr/src/md/unix/Makefile.in
This commit is contained in:
wtc%netscape.com 2003-01-06 23:42:06 +00:00
parent 664ebf4e1a
commit f5ecb8f66d
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nsprpub/config/rules.mk
View File

@ -169,6 +169,10 @@ ALL_TRASH += $(VMS_SYMVEC_FILE)
endif
endif
ifndef RELEASE_LIBS_DEST
RELEASE_LIBS_DEST = $(RELEASE_LIB_DIR)
endif
ifdef DIRS
LOOP_OVER_DIRS = \
@for d in $(DIRS); do \
@ -218,7 +222,7 @@ ifdef RELEASE_HEADERS
$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
endif
ifdef RELEASE_LIBS
$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)
$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
endif
+$(LOOP_OVER_DIRS)
@ -247,13 +251,13 @@ ifdef RELEASE_LIBS
else \
true; \
fi
@if test ! -d $(RELEASE_LIB_DIR); then \
rm -rf $(RELEASE_LIB_DIR); \
$(NSINSTALL) -D $(RELEASE_LIB_DIR);\
@if test ! -d $(RELEASE_LIBS_DEST); then \
rm -rf $(RELEASE_LIBS_DEST); \
$(NSINSTALL) -D $(RELEASE_LIBS_DEST);\
else \
true; \
fi
cp $(RELEASE_LIBS) $(RELEASE_LIB_DIR)
cp $(RELEASE_LIBS) $(RELEASE_LIBS_DEST)
endif
ifdef RELEASE_HEADERS
@echo "Copying header files to release directory"

5
nsprpub/pr/src/Makefile.in
View File

@ -72,6 +72,11 @@ else # 4.1.3_U1
MAPFILE = $(OBJDIR)/nsprmap.sun
GARBAGE += $(MAPFILE)
MKSHLIB += -M $(MAPFILE)
#
# A "cpu" subdirectory will be created in this directory if NSDISTMODE
# is not "copy". (See the comments in pr/src/md/unix/Makefile.in for
# the reason.) This needs to be removed, too.
#
ifneq ($(NSDISTMODE),copy)
GARBAGE += cpu
endif

9
nsprpub/pr/src/md/unix/Makefile.in
View File

@ -76,6 +76,8 @@ ifeq ($(OS_ARCH),SunOS)
ULTRASPARC_ASOBJS = $(addprefix $(OBJDIR)/,$(ULTRASPARC_ASFILES:.s=.$(OBJ_SUFFIX)))
TARGETS += $(ULTRASPARC_ASOBJS) $(SHARED_LIBRARY)
RELEASE_LIBS = $(SHARED_LIBRARY)
RELEASE_LIBS_DEST = $(RELEASE_LIB_DIR)/cpu/sparcv8plus
lib_subdir = cpu/sparcv8plus
endif
endif
endif
@ -100,6 +102,13 @@ else
$(SHARED_LIBRARY): $(ULTRASPARC_ASOBJS)
$(LD) -G -z text -z endfiltee -o $@ $(ULTRASPARC_ASOBJS)
$(INSTALL) -m 444 $@ $(dist_libdir)/cpu/sparcv8plus
#
# The -f $(ORIGIN)/... linker flag uses the real file, after symbolic links
# are resolved, as the origin. If NSDISTMODE is not "copy", libnspr4.so
# will be installed as a symbolic link in $(dist_libdir), pointing to the
# real libnspr4.so file in pr/src. Therefore we need to install an
# additional copy of libnspr_flt4.so in pr/src/cpu/sparcv8plus.
#
ifneq ($(NSDISTMODE),copy)
$(INSTALL) -m 444 $@ ../../cpu/sparcv8plus
endif