summaryrefslogtreecommitdiff
path: root/Makeconf
diff options
context:
space:
mode:
Diffstat (limited to 'Makeconf')
-rw-r--r--Makeconf19
1 files changed, 11 insertions, 8 deletions
diff --git a/Makeconf b/Makeconf
index b9e0b92e..028ac391 100644
--- a/Makeconf
+++ b/Makeconf
@@ -131,14 +131,15 @@ BUGADDR_REF = -uargp_program_bug_address
# Installation
ifeq ($(doinst),one)
all: $(target)
-install: $(installationdir)/$(target) $(installationdir)
-$(installationdir)/$(target): $(target)
+install: $(installationdir)/$(target)
+$(installationdir)/$(target): $(target) $(installationdir)
$(INSTALL_PROGRAM) $(INSTALL-$<-ops) $< $@
endif
ifeq ($(doinst),many)
all: $(targets)
-install: $(addprefix $(installationdir)/,$(targets)) $(installationdir)
+install: $(addprefix $(installationdir)/,$(targets))
+$(addprefix $(installationdir)/,$(targets)): $(installationdir)
$(addprefix $(installationdir)/,$(targets)): $(installationdir)/%: %
$(INSTALL_PROGRAM) $(INSTALL-$<-ops) $< $@
endif
@@ -147,11 +148,11 @@ ifeq ($(makemode),library)
all: libs
install libs: add-to-librecord
add-to-librecord: $(targets)
-install: $(addprefix $(libdir)/,$(targets)) $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)) $(libdir) $(includedir) $(includedir)/$(installhdrsubdir)
+install: $(addprefix $(libdir)/,$(targets)) $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs))
-install-headers: $(includedir)/$(installhdrsubdir) $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)) $(includedir)
+install-headers: $(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs))
-$(includedir)/$(installhdrsubdir):
+$(includedir)/$(installhdrsubdir): $(includedir)
$(MKINSTALLDIRS) $@
# Arrange to have the headers installed locally anytime we build the library.
@@ -168,12 +169,14 @@ $(INSTALLED_LOCAL_HEADERS): $(top_srcdir)/$(installhdrsubdir)/%:
endif
libs: $(INSTALLED_LOCAL_HEADERS)
-$(libdir)/$(libname).a: $(libname).a
+$(libdir)/$(libname).a: $(libname).a $(libdir)
$(INSTALL_DATA) $(libname).a $(libdir)/$(libname).a
$(RANLIB) $(libdir)/$(libname).a
-$(libdir)/$(libname).so: $(libname).so
+$(libdir)/$(libname).so: $(libname).so $(libdir)
$(INSTALL_DATA) $(libname).so $(libdir)/$(libname).so
+$(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)): $(includdir)/$(installhdrsubdir)
+
$(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs)): $(includedir)/$(installhdrsubdir)/%: %
$(INSTALL_DATA) $< $@