summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>1999-09-17 11:42:20 +0000
committerThomas Bushnell <thomas@gnu.org>1999-09-17 11:42:20 +0000
commite4c28917dd3ee9708ded9fe19b314e6ca4ab5eef (patch)
tree9c15d9089a6039de5f025da70db0ef3605503ba6
parent91b64adda28e0545b00f145000e9aff87134f068 (diff)
1999-09-17 Thomas Bushnell, BSG <tb@mit.edu>
* Makeconf [Installation section]: Last change (9 Sep 1999) broke this. Separate more clearly the library and non-library install rules.
-rw-r--r--ChangeLog4
-rw-r--r--Makeconf7
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e61b8c3b..5040e079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
1999-09-17 Thomas Bushnell, BSG <tb@mit.edu>
+ * Makeconf [Installation section]: Last change (9 Sep 1999) broke
+ this. Separate more clearly the library and non-library install
+ rules.
+
* Makefile ($(prog-subdirs) $(lib-subdirs), %-lndist, %-clean,
%-relink, %-objs, %-install, %-install-headers, %-TAGS, %.d): Pass
-e to sub-make, so that explicit prefix= args (etc.) get passed
diff --git a/Makeconf b/Makeconf
index d29698e5..3985b10f 100644
--- a/Makeconf
+++ b/Makeconf
@@ -175,6 +175,9 @@ endif
endif
# Installation
+ifneq ($(makemode),library)
+
+# not library
ifndef targets
targets = $(target)
endif
@@ -184,8 +187,10 @@ all: $(install-targets)
install: $(installationdir) $(addprefix $(installationdir)/,$(install-targets))
$(addprefix $(installationdir)/,$(installable)): $(installationdir)/%: %
$(INSTALL_PROGRAM) $(INSTALL-$<-ops) $< $@
+else
+
+# library (several parts, library itself, headers, etc.)
-ifeq ($(makemode),library)
all: libs
install libs: add-to-librecord
add-to-librecord: $(targets)