diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-11-19 21:49:11 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-11-19 21:49:11 +0000 |
| commit | f231dfc2774dc450ce7d14a139ac25675cd353d7 (patch) | |
| tree | 9798a3095767ee5108b4dbfcb1887a031398c93b | |
| parent | 6a9ae5d6fdc412d538f5fdd0c47c2b332336df35 (diff) | |
| download | s6-linux-utils-f231dfc2774dc450ce7d14a139ac25675cd353d7.tar.gz s6-linux-utils-f231dfc2774dc450ce7d14a139ac25675cd353d7.tar.xz s6-linux-utils-f231dfc2774dc450ce7d14a139ac25675cd353d7.zip | |
better configure, better make strip
| -rw-r--r-- | Makefile | 13 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 7 insertions, 8 deletions
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 |