diff options
| author | Roland McGrath <roland@gnu.org> | 1999-10-03 20:23:30 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1999-10-03 20:23:30 +0000 |
| commit | 79eee0e32d75d4b868a2a75121feb341333d1e3e (patch) | |
| tree | 2edd3ccd6e7c22240a9f4501d8cbbb95df26fde2 | |
| parent | 064cb7d58e0271582aba70241fe216a29ac051aa (diff) | |
1999-10-03 Roland McGrath <roland@baalperazim.frob.com>
* Makeconf [$(makemode) = misc]: If no installationdir and no targets,
set makemode-instdir so it's not empty, to avoid expanding `$(dir)'.
| -rw-r--r-- | Makeconf | 34 |
1 files changed, 18 insertions, 16 deletions
@@ -148,23 +148,25 @@ ifeq ($(makemode),library) else - progtarg := $(filter-out $(special-targets),$(targets)) - linktarg := $(progtarg) $(progtarg:=.static) - -endif + ifeq ($(makemode),misc) + ifndef doinst + doinst := many + endif + ifeq ($(doinst),one) + targets = $(target) + endif + ifeq (,$(installationdir)) + ifneq (,$(targets)) + ?Error subdir Makefile must define installationdir + else + makemode-instdir := NOINSTALL + endif + endif + else # server/utility modes + progtarg := $(filter-out $(special-targets),$(targets)) + linktarg := $(progtarg) $(progtarg:=.static) + endif -ifeq ($(makemode),misc) - ifndef doinst - doinst := many - endif - ifeq ($(doinst),one) - targets = $(target) - endif - ifndef installationdir - ifneq (,$(targets)) - ?Error subdir Makefile must define installationdir - endif - endif endif ifndef installationdir |