From 1c3bf0e9c0b2f6cc8d0ea5e7a2cff20b943a93aa Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 4 Nov 2015 16:38:33 +0000
Subject:  - link .so to correct soname  - fully strip shared libs  - Makefile
 syntactic consistency

---
 Makefile         | 22 ++++++++++------------
 doc/index.html   |  2 +-
 doc/upgrade.html |  6 ++++++
 package/info     |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index c3b4a4a..867f033 100644
--- a/Makefile
+++ b/Makefile
@@ -60,22 +60,21 @@ 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 && \
-	rm -rf /tmp/$$package-$$version && \
-	cp -a . /tmp/$$package-$$version && \
+	@rm -rf /tmp/$(package)-$(version) && \
+	cp -a . /tmp/$(package)-$(version) && \
 	cd /tmp && \
-	tar -zpcv --owner=0 --group=0 --numeric-owner --exclude=.git* -f /tmp/$$package-$$version.tar.gz $$package-$$version && \
-	exec rm -rf /tmp/$$package-$$version
+	tar -zpcv --owner=0 --group=0 --numeric-owner --exclude=.git* -f /tmp/$(package)-$(version).tar.gz $(package)-$(version) && \
+	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 +110,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/doc/index.html b/doc/index.html
index 32b62d2..4a14c4f 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -66,7 +66,7 @@ scripts are also run in a controlled environment.
 
 <ul>
  <li> The current released version of s6-rc is
-<a href="s6-rc-0.0.1.3.tar.gz">0.0.1.3</a>. </li>
+<a href="s6-rc-0.0.1.4.tar.gz">0.0.1.4</a>. </li>
  <li> Alternatively, you can checkout a copy of the s6-rc git repository:
 <pre> git clone git://git.skarnet.org/s6-rc </pre> </li>
  <li> There's also a
diff --git a/doc/upgrade.html b/doc/upgrade.html
index d9de4e4..2cb2fda 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
 
 <h1> What has changed in s6-rc </h1>
 
+<h2> in 0.0.1.4 </h2>
+
+<ul>
+ <li> No functional changes. </li>
+</ul>
+
 <h2> in 0.0.1.3 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index aeba54b..7ac42f4 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-rc
-version=0.0.1.3
+version=0.0.1.4
 category=admin
 package_macro_name=S6RC
-- 
cgit v1.2.3