From c863c27eb00b768732015be3d38bcacb8fee9ba2 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 16 Oct 2016 21:16:54 +0000 Subject: Implement --enable-absolute-paths --- Makefile | 11 +++++------ configure | 47 +++++++++++++++++++---------------------------- package/targets.mak | 4 +--- 3 files changed, 25 insertions(+), 37 deletions(-) diff --git a/Makefile b/Makefile index 67fb474..bffc468 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ RANLIB := $(CROSS_COMPILE)ranlib STRIP := $(CROSS_COMPILE)strip INSTALL := ./tools/install.sh -ALL_BINS := $(LIBEXEC_TARGETS) $(BIN_TARGETS) $(SBIN_TARGETS) +ALL_BINS := $(LIBEXEC_TARGETS) $(BIN_TARGETS) ALL_LIBS := $(SHARED_LIBS) $(STATIC_LIBS) $(INTERNAL_LIBS) ALL_INCLUDES := $(wildcard src/include/$(package)/*.h) @@ -78,11 +78,10 @@ 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 +install: install-dynlib install-libexec install-bin install-lib install-include install-dynlib: $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(dynlibdir)/lib%.so) install-libexec: $(LIBEXEC_TARGETS:%=$(DESTDIR)$(libexecdir)/%) install-bin: $(BIN_TARGETS:%=$(DESTDIR)$(bindir)/%) -install-sbin: $(SBIN_TARGETS:%=$(DESTDIR)$(sbindir)/%) install-lib: $(STATIC_LIBS:lib%.a.xyzzy=$(DESTDIR)$(libdir)/lib%.a) install-include: $(ALL_INCLUDES:src/include/$(package)/%.h=$(DESTDIR)$(includedir)/$(package)/%.h) install-data: $(ALL_DATA:src/etc/%=$(DESTDIR)$(datadir)/%) @@ -94,7 +93,7 @@ $(DESTDIR)$(exthome): $(DESTDIR)$(home) update: $(DESTDIR)$(exthome) -global-links: $(DESTDIR)$(exthome) $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(sproot)/library.so/lib%.so.$(version_M)) $(BIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%) $(SBIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%) +global-links: $(DESTDIR)$(exthome) $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(sproot)/library.so/lib%.so.$(version_M)) $(BIN_TARGETS:%=$(DESTDIR)$(sproot)/command/%) $(DESTDIR)$(sproot)/command/%: $(DESTDIR)$(home)/command/% exec $(INSTALL) -D -l ..$(subst $(sproot),,$(exthome))/command/$(&3 3>&- diff --git a/package/targets.mak b/package/targets.mak index 9953c80..9573a5f 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -2,9 +2,7 @@ BIN_TARGETS := \ s6-rc-compile \ s6-rc-dryrun \ s6-rc-db \ -s6-rc-bundle - -SBIN_TARGETS := \ +s6-rc-bundle \ s6-rc-init \ s6-rc \ s6-rc-update -- cgit v1.2.3