Clean up *objdir variables.

2 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5fcf34d..7108c3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-09-28  Roland McGrath  <roland@hack.frob.com>
 
+	* Makeconfig (nssobjdir, resolvobjdir): Remove variables.
+	(elfobjdir): Move out of conditionals.
+
 	* nss/nsswitch.c (nss_new_service): Conditionalize definition and
 	declaration on [!DO_STATIC_NSS || SHARED], matching its only caller.
 	(__nss_lookup_function): Conditionalize label remove_from_tree on
diff --git a/Makeconfig b/Makeconfig
index e96ebc7..6a54bf3 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -494,15 +494,14 @@ link-libc-tests = $(link-libc-before-gnulib) $(gnulib-tests)
 rpath-dirs = math elf dlfcn nss nis rt resolv crypt
 rpath-link = \
 $(common-objdir):$(subst $(empty) ,:,$(patsubst ../$(subdir),.,$(rpath-dirs:%=$(common-objpfx)%)))
-elfobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)elf)
 else
-nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
-resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
 link-libc = $(common-objpfx)libc.a $(otherlibs) $(gnulib) $(common-objpfx)libc.a $(gnulib)
 link-libc-tests = $(common-objpfx)libc.a $(otherlibs) $(gnulib-tests) $(common-objpfx)libc.a $(gnulib-tests)
 endif
 endif
 
+elfobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)elf)
+
 # Differences in the linkers on the various platforms.
 LDFLAGS-rpath-ORIGIN = -Wl,-rpath,'$$ORIGIN'
 LDFLAGS-soname-fname = -Wl,-soname,$(@F)