INN commit: trunk (4 files)
INN Commit
rra at isc.org
Fri Jul 6 18:11:07 UTC 2012
Date: Friday, July 6, 2012 @ 11:11:06
Author: eagle
Revision: 9439
Stop creating backups for shared libraries
Introduce a new LI_LPUB command and use it for shared library
installation. Document in Makefile.global.in why shared libraries can't
use the normal backup mechanism.
Modified:
trunk/Makefile.global.in
trunk/history/Makefile
trunk/lib/Makefile
trunk/storage/Makefile
--------------------+
Makefile.global.in | 26 ++++++++++++++++----------
history/Makefile | 2 +-
lib/Makefile | 2 +-
storage/Makefile | 2 +-
4 files changed, 19 insertions(+), 13 deletions(-)
Modified: Makefile.global.in
===================================================================
--- Makefile.global.in 2012-07-06 18:03:19 UTC (rev 9438)
+++ Makefile.global.in 2012-07-06 18:11:06 UTC (rev 9439)
@@ -286,17 +286,22 @@
INSTALL = $(top)/support/install-sh -c
-## Installation commands. These commands are used by the installation rules
-## of each separate subdirectory. The naming scheme is as follows: the first
-## two characters are CP (indicating a plain copy) or LI (indicating an
-## installation that goes through libtool). After an underscore is a
-## one-character indicator of the file type (R for a regular file, X for an
-## executable, S for a setuid root executable) and then PUB for a
-## world-readable/world-executable file or PRI for a group-readable/
-## group-executable file (only the news group).
+## Installation commands. These commands are used by the installation
+## rules of each separate subdirectory. The naming scheme is as follows:
+## the first two characters are CP (indicating a plain copy) or LI
+## (indicating an installation that goes through libtool). After an
+## underscore is a one-character indicator of the file type (R for a
+## regular file, X for an executable, S for a setuid root executable, L for
+## a shared library) and then PUB for a world-readable/world-executable
+## file or PRI for a group-readable/ group-executable file (only the news
+## group).
##
-## Man pages should not be backed up with an .OLD extension since it causes man
-## to complain about bogus filenames in MANPATH.
+## Man pages should not be backed up with an .OLD extension since it causes
+## man to complain about bogus filenames in MANPATH. Shared libraries
+## should not be backed up with an .OLD extension since ldconfig will
+## select the .OLD version in preference to the regular version. We use
+## shared library versioning to allow recovery from make update for shared
+## libraries.
##
## inews and rnews have their own special installation rules, as do database
## files like active and newsgroups that should have the same permissions as
@@ -307,6 +312,7 @@
LI_SPRI = $(LIBTOOLINST) $(INSTALL) -o root -g $(RUNASGROUP) -m 4550 $(BACKUP_OPTION)
LI_XPRI = $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0550 $(BACKUP_OPTION)
LI_XPUB = $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0555 $(BACKUP_OPTION)
+LI_LPUB = $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0555
LI_INEWS = $(LIBTOOLINST) $(INSTALL) $(OWNER) -m $(INEWSMODE) $(BACKUP_OPTION)
LI_RNEWS = $(LIBTOOLINST) $(INSTALL) $(ROWNER) -m $(RNEWSMODE) $(BACKUP_OPTION)
Modified: history/Makefile
===================================================================
--- history/Makefile 2012-07-06 18:03:19 UTC (rev 9438)
+++ history/Makefile 2012-07-06 18:11:06 UTC (rev 9439)
@@ -29,7 +29,7 @@
$(MAKE) COPT='$(WARNINGS)' all
install: all
- $(LI_XPUB) libinnhist.$(EXTLIB) $D$(PATHLIB)/libinnhist.$(EXTLIB)
+ $(LI_LPUB) libinnhist.$(EXTLIB) $D$(PATHLIB)/libinnhist.$(EXTLIB)
bootstrap: Make.methods
Modified: lib/Makefile
===================================================================
--- lib/Makefile 2012-07-06 18:03:19 UTC (rev 9438)
+++ lib/Makefile 2012-07-06 18:11:06 UTC (rev 9439)
@@ -43,7 +43,7 @@
$(MAKE) COPT='$(WARNINGS)' all
install: all
- $(LI_XPUB) libinn.$(EXTLIB) $D$(PATHLIB)/libinn.$(EXTLIB)
+ $(LI_LPUB) libinn.$(EXTLIB) $D$(PATHLIB)/libinn.$(EXTLIB)
bootstrap:
Modified: storage/Makefile
===================================================================
--- storage/Makefile 2012-07-06 18:03:19 UTC (rev 9438)
+++ storage/Makefile 2012-07-06 18:11:06 UTC (rev 9439)
@@ -30,7 +30,7 @@
$(MAKE) COPT='$(WARNINGS)' all
install: all
- $(LI_XPUB) libstorage.$(EXTLIB) $D$(PATHLIB)/libstorage.$(EXTLIB)
+ $(LI_LPUB) libstorage.$(EXTLIB) $D$(PATHLIB)/libstorage.$(EXTLIB)
for F in $(PROGRAMS) ; do \
$(LI_XPRI) $$F $D$(PATHBIN)/`basename $$F` ; \
done
More information about the inn-committers
mailing list