From 79eee0e32d75d4b868a2a75121feb341333d1e3e Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Sun, 3 Oct 1999 20:23:30 +0000
Subject: 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)'.
---
 Makeconf | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/Makeconf b/Makeconf
index 27d9c327..a321ac4d 100644
--- a/Makeconf
+++ b/Makeconf
@@ -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
-- 
cgit v1.2.3