From 4fab8059e7cce29b8643bf42a90de50b958011b4 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 12 Aug 2015 09:43:13 +0000
Subject:  Xyzzy fix! (fixes https://bugs.gentoo.org/show_bug.cgi?id=541092)

---
 Makefile         | 24 ++++++++++++------------
 configure        |  4 ++--
 doc/index.html   |  2 +-
 doc/upgrade.html |  7 +++++++
 package/info     |  2 +-
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 31e358c..96a0028 100644
--- a/Makefile
+++ b/Makefile
@@ -74,8 +74,8 @@ strip: $(ALL_LIBS)
 install: install-data install-sysdeps install-dynlib install-lib install-include
 install-data: $(ALL_DATA:src/etc/%=$(DESTDIR)$(datadir)/%)
 install-sysdeps: $(ALL_SYSDEPS:$(sysdeps)/%=$(DESTDIR)$(sysdepdir)/%)
-install-dynlib: $(SHARED_LIBS:lib%.so=$(DESTDIR)$(dynlibdir)/lib%.so)
-install-lib: $(STATIC_LIBS:lib%.a=$(DESTDIR)$(libdir)/lib%.a)
+install-dynlib: $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(dynlibdir)/lib%.so)
+install-lib: $(STATIC_LIBS:lib%.a.xyzzy=$(DESTDIR)$(libdir)/lib%.a)
 install-include: $(ALL_INCLUDES:src/include/$(package)/%.h=$(DESTDIR)$(includedir)/$(package)/%.h)
 
 ifneq ($(exthome),)
@@ -83,7 +83,7 @@ ifneq ($(exthome),)
 update:
 	exec $(INSTALL) -l $(notdir $(home)) $(DESTDIR)$(exthome)
 
-global-links: $(DESTDIR)$(exthome) $(SHARED_LIBS:lib%.so=$(DESTDIR)$(sproot)/library.so/lib%.so)
+global-links: $(DESTDIR)$(exthome) $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(sproot)/library.so/lib%.so)
 
 $(DESTDIR)$(sproot)/library.so/lib%.so: $(DESTDIR)$(home)/library.so/lib%.so
 	exec $(INSTALL) -D -l ..$(subst $(sproot),,$(exthome))/library.so/$(<F) $@
@@ -98,14 +98,14 @@ $(DESTDIR)$(datadir)/%: src/etc/%
 $(DESTDIR)$(sysdepdir)/%: $(sysdeps)/%
 	exec $(INSTALL) -D -m 644 $< $@
 
-$(DESTDIR)$(dynlibdir)/%.so: %.so
+$(DESTDIR)$(dynlibdir)/%.so: %.so.xyzzy
 	$(INSTALL) -D -m 755 $< $@.$(version) && \
-	$(INSTALL) -l $<.$(version) $@.$(version_m) && \
-	$(INSTALL) -l $<.$(version_m) $@.$(version_M) && \
-	$(INSTALL) -l $<.$(version_M) $@.$(version_l) && \
-	exec $(INSTALL) -l $<.$(version_l) $@
+	$(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) $@
 
-$(DESTDIR)$(libdir)/lib%.a: lib%.a
+$(DESTDIR)$(libdir)/lib%.a: lib%.a.xyzzy
 	exec $(INSTALL) -D -m 644 $< $@
 
 $(DESTDIR)$(includedir)/$(package)/%.h: src/include/$(package)/%.h
@@ -117,12 +117,12 @@ $(DESTDIR)$(includedir)/$(package)/%.h: src/include/$(package)/%.h
 %.lo: %.c
 	exec $(REALCC) $(CPPFLAGS_ALL) $(CFLAGS_ALL) $(CFLAGS_SHARED) -c -o $@ $<
 
-libskarnet.a: $(ALL_SOBJS)
+libskarnet.a.xyzzy: $(ALL_SOBJS)
 	exec $(AR) rc $@ $^
 	exec $(RANLIB) $@
 
-libskarnet.so: $(ALL_DOBJS)
-	exec $(REALCC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $(LDFLAGS_SHARED) -Wl,-soname,$@.$(version_l) $^
+libskarnet.so.xyzzy: $(ALL_DOBJS)
+	exec $(REALCC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $(LDFLAGS_SHARED) -Wl,-soname,libskarnet.so.$(version_l) $^
 
 .PHONY: it all clean distclean tgz strip install install-data install-sysdeps install-dynlib install-lib install-include
 
diff --git a/configure b/configure
index b1d38cb..689a5b5 100755
--- a/configure
+++ b/configure
@@ -535,12 +535,12 @@ if test -n "$vpathd" ; then
 fi
 
 if $static ; then
-  echo "STATIC_LIBS := libskarnet.a"
+  echo "STATIC_LIBS := libskarnet.a.xyzzy"
 else
   echo "STATIC_LIBS :="
 fi
 if $shared ; then
-  echo "SHARED_LIBS := libskarnet.so"
+  echo "SHARED_LIBS := libskarnet.so.xyzzy"
 else
   echo "SHARED_LIBS :="
 fi
diff --git a/doc/index.html b/doc/index.html
index f456a5d..9c382b2 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -60,7 +60,7 @@ with a standard C development environment </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of skalibs is <a href="skalibs-2.3.6.0.tar.gz">2.3.6.0</a>. </li>
+ <li> The current released version of skalibs is <a href="skalibs-2.3.6.1.tar.gz">2.3.6.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the skalibs git repository:
 <pre> git clone git://git.skarnet.org/skalibs </pre> </li>
 </ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index bc7b6f3..381aa8a 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in skalibs </h1>
 
+<h2> in 2.3.6.1 </h2>
+
+<ul>
+ <li> No functional changes. </li>
+</ul>
+
+
 <h2> in 2.3.6.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 4275e52..8845d15 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=skalibs
-version=2.3.6.0
+version=2.3.6.1
 category=prog
 package_macro_name=SKALIBS
-- 
cgit v1.2.3