diff options
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | doc/upgrade.html | 6 | ||||
| -rw-r--r-- | 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 b7f2c0d..99dd520 100644 --- a/doc/index.html +++ b/doc/index.html @@ -100,7 +100,7 @@ library. </li> <h3> Download </h3> <ul> - <li> The current released version of s6 is <a href="s6-2.2.2.1.tar.gz">2.2.2.1</a>. </li> + <li> The current released version of s6 is <a href="s6-2.2.2.2.tar.gz">2.2.2.2</a>. </li> <li> Alternatively, you can checkout a copy of the s6 git repository: <pre> git clone git://git.skarnet.org/s6 </pre> </li> <li> There's also a diff --git a/doc/upgrade.html b/doc/upgrade.html index 523d510..08303b2 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,12 @@ <h1> What has changed in s6 </h1> +<h2> in 2.2.2.2 </h2> + +<ul> + <li> No functional changes </li> +</ul> + <h2> in 2.2.2.1 </h2> <ul> diff --git a/package/info b/package/info index 44b4e4e..3539339 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6 -version=2.2.2.1 +version=2.2.2.2 category=admin package_macro_name=S6 |