From 7bb764087750f33ddcdfbac20944e3903665510c Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 10 Nov 2015 11:53:01 +0000 Subject: - configure fix - better make strip - rc for 2.0.5.4 --- INSTALL | 2 +- Makefile | 13 ++++++------- configure | 2 +- doc/index.html | 4 ++-- doc/upgrade.html | 6 ++++++ package/info | 2 +- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/INSTALL b/INSTALL index 8951682..b6fe232 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.3.8.0 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.3.8.2 or later: http://skarnet.org/software/skalibs/ This software will run on any operating system that implements POSIX.1-2008, available at: diff --git a/Makefile b/Makefile index c3b4a4a..f5b8657 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ clean: @exec rm -f $(ALL_LIBS) $(ALL_BINS) $(wildcard src/*/*.o src/*/*.lo) $(EXTRA_TARGETS) distclean: clean - @exec rm -f config.mak src/include/${package}/config.h + @exec rm -f config.mak src/include/$(package)/config.h tgz: distclean @. package/info && \ @@ -71,11 +71,11 @@ tgz: distclean exec rm -rf /tmp/$$package-$$version strip: $(ALL_LIBS) $(ALL_BINS) -ifneq ($(strip $(ALL_LIBS)),) - exec ${STRIP} -x -R .note -R .comment -R .note.GNU-stack $(ALL_LIBS) +ifneq ($(strip $(STATIC_LIBS)),) + exec $(STRIP) -x -R .note -R .comment -R .note.GNU-stack $(STATIC_LIBS) endif -ifneq ($(strip $(ALL_BINS)),) - exec ${STRIP} -R .note -R .comment -R .note.GNU-stack $(ALL_BINS) +ifneq ($(strip $(ALL_BINS)$(SHARED_LIBS)),) + exec $(STRIP) -R .note -R .comment -R .note.GNU-stack $(ALL_BINS) $(SHARED_LIBS) endif install: install-dynlib install-libexec install-bin install-sbin install-lib install-include @@ -111,8 +111,7 @@ $(DESTDIR)$(dynlibdir)/lib%.so: lib%.so.xyzzy $(INSTALL) -D -m 755 $< $@.$(version) && \ $(INSTALL) -l $(@F).$(version) $@.$(version_m) && \ $(INSTALL) -l $(@F).$(version_m) $@.$(version_M) && \ - $(INSTALL) -l $(@F).$(version_M) $@.$(version_l) && \ - exec $(INSTALL) -l $(@F).$(version_l) $@ + exec $(INSTALL) -l $(@F).$(version_M) $@ $(DESTDIR)$(libexecdir)/% $(DESTDIR)$(bindir)/% $(DESTDIR)$(sbindir)/%: % package/modes exec $(INSTALL) -D -m 600 $< $@ diff --git a/configure b/configure index ab6a070..1f9b16e 100755 --- a/configure +++ b/configure @@ -205,7 +205,7 @@ fi # Expand installation directories stripdir prefix -for i in exec_prefix dynlibdir libexecdir bindir sbindir libdir includedir datadir sysdeps sproot skalibs ; do +for i in exec_prefix dynlibdir libexecdir bindir sbindir libdir includedir datadir sysdeps sproot ; do eval tmp=\${$i} eval $i=$tmp stripdir $i diff --git a/doc/index.html b/doc/index.html index 8e6dc0c..a76e80d 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@ the package is now used to host specific utilities such as
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.3.8.0 or later. It's a build-time requirement. It's also a run-time +2.3.8.2 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library.
    • @@ -77,7 +77,7 @@ library. diff --git a/doc/upgrade.html b/doc/upgrade.html index ccedfce..2c1448c 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,12 @@

    What has changed in s6-portable-utils

    +

    in 2.0.5.4

    + + +

    in 2.0.5.3