diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-11-19 21:47:45 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-11-19 21:47:45 +0000 |
| commit | 73bea8ab25859ca8a3e43c008087dd34a9d0b945 (patch) | |
| tree | 0662c7083694725f7d57b52e426ed2bdefa9c6cf | |
| parent | 2bbc798dc1dcb3bc96110794b17a7dd65f354f3e (diff) | |
| download | s6-linux-init-73bea8ab25859ca8a3e43c008087dd34a9d0b945.tar.xz | |
better configure, better strip, small init-maker bugfix
| -rw-r--r-- | Makefile | 13 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | src/init/s6-linux-init-maker.c | 2 |
3 files changed, 8 insertions, 10 deletions
@@ -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 $< $@ @@ -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 @@ -320,7 +320,6 @@ else LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibdpath}" fi - if test -z "$vpaths" ; then while read dep ; do base=$(basename $dep) ; diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c index 87d3787..04f18d1 100644 --- a/src/init/s6-linux-init-maker.c +++ b/src/init/s6-linux-init-maker.c @@ -307,7 +307,7 @@ static inline int make_init_script (buffer *b) || buffer_puts(b, "/cd /\ns6-setsid -qb --\numask 0") < 0 || buffer_put(b, fmt, uint_ofmt(fmt, initial_umask)) < 0 || buffer_puts(b, "\nif { s6-echo -- ") < 0 - || !string_quote(&satmp, BANNER, sizeof(BANNER) - 1) < 0) return 0 ; + || !string_quote(&satmp, BANNER, sizeof(BANNER) - 1)) return 0 ; if (buffer_put(b, satmp.s, satmp.len) < 0) goto err ; satmp.len = sabase ; if (buffer_puts(b, " }\nif { s6-mount -nwt tmpfs -o mode=0755 tmpfs ") < 0 |