1ea3eea498
Team work by wilfried@, kurt@ and me. Tested by many. Thanks a lot! ok kurt@ krw@ jolan@ ian@ pvalchev@
72 lines
3.0 KiB
Plaintext
72 lines
3.0 KiB
Plaintext
$OpenBSD: patch-config_rules_mk,v 1.3 2005/12/20 23:44:00 bernd Exp $
|
|
--- config/rules.mk.orig Tue Oct 11 01:16:39 2005
|
|
+++ config/rules.mk Thu Nov 3 10:44:13 2005
|
|
@@ -667,7 +667,7 @@ ifdef SHARED_LIBRARY
|
|
ifdef IS_COMPONENT
|
|
ifdef GRE_MODULE
|
|
ifndef DISABLE_DIST_GRE
|
|
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(GRE_DIST)/components
|
|
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(GRE_DIST)/components
|
|
$(ELF_DYNSTR_GC) $(GRE_DIST)/components/$(SHARED_LIBRARY)
|
|
ifdef BEOS_ADDON_WORKAROUND
|
|
( cd $(GRE_DIST)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
|
|
@@ -675,7 +675,7 @@ endif
|
|
endif
|
|
endif # GRE_MODULE
|
|
ifndef _SKIP_OLD_GRE_INSTALL
|
|
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
|
|
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
|
|
$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
|
|
ifdef BEOS_ADDON_WORKAROUND
|
|
( cd $(FINAL_TARGET)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
|
|
@@ -684,7 +684,7 @@ endif # ! _SKIP_OLD_GRE_INSTALL
|
|
else # ! IS_COMPONENT
|
|
ifdef GRE_MODULE
|
|
ifndef DISABLE_DIST_GRE
|
|
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(GRE_DIST)
|
|
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(GRE_DIST)
|
|
ifdef BEOS_ADDON_WORKAROUND
|
|
( cd $(GRE_DIST) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
|
|
endif
|
|
@@ -694,10 +694,10 @@ endif # GRE_MODULE
|
|
ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
|
|
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
|
|
else
|
|
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
|
|
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/lib
|
|
endif
|
|
ifndef _SKIP_OLD_GRE_INSTALL
|
|
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)
|
|
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(FINAL_TARGET)
|
|
ifdef BEOS_ADDON_WORKAROUND
|
|
( cd $(FINAL_TARGET) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
|
|
endif
|
|
@@ -765,15 +765,15 @@ ifndef NO_INSTALL
|
|
ifdef SHARED_LIBRARY
|
|
ifdef IS_COMPONENT
|
|
ifdef MRE_DIST
|
|
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/components
|
|
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/components
|
|
else
|
|
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/components
|
|
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/components
|
|
endif
|
|
else
|
|
ifdef MRE_DIST
|
|
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)
|
|
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)
|
|
else
|
|
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)
|
|
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)
|
|
endif
|
|
endif
|
|
endif # SHARED_LIBRARY
|
|
@@ -1043,7 +1043,6 @@ endif # NO_LD_ARCHIVE_FLAGS
|
|
else # os2 vacpp
|
|
$(MKSHLIB) -O:$@ -DLL -INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
|
|
endif # !os2 vacpp
|
|
- chmod +x $@
|
|
ifndef NO_COMPONENT_LINK_MAP
|
|
ifndef MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS
|
|
ifndef MOZ_DEBUG
|