From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-6492-listarch-libc-hacker=sources.redhat.com@sources.redhat.com>
Received: (qmail 18606 invoked by alias); 27 Apr 2003 16:11:14 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 18590 invoked from network); 27 Apr 2003 16:11:14 -0000
Received: from unknown (HELO mout2.freenet.de) (194.97.50.155)
  by sources.redhat.com with SMTP; 27 Apr 2003 16:11:14 -0000
Received: from [194.97.50.144] (helo=mx1.freenet.de)
	by mout2.freenet.de with asmtp (Exim 4.15)
	id 199okD-0002FI-Mq
	for libc-hacker@sources.redhat.com; Sun, 27 Apr 2003 18:11:13 +0200
Received: from b0199.pppool.de ([213.7.1.153] helo=whitebox.local)
	by mx1.freenet.de with esmtp (Exim 4.15 #3)
	id 199okC-0007di-Nw
	for libc-hacker@sources.redhat.com; Sun, 27 Apr 2003 18:11:13 +0200
Received: from whitebox.local (localhost [127.0.0.1])
	by whitebox.local (8.12.7/8.12.7/SuSE Linux 0.6) with ESMTP id h3REsD7M012960
	for <libc-hacker@sources.redhat.com>; Sun, 27 Apr 2003 16:54:14 +0200
Received: (from andreas@localhost)
	by whitebox.local (8.12.7/8.12.7/Submit) id h3REsCjY012957;
	Sun, 27 Apr 2003 16:54:13 +0200
X-Authentication-Warning: whitebox.local: andreas set sender to schwab@suse.de using -f
To: libc-hacker@sources.redhat.com
Subject: Fix sysd-sorted generation
X-Yow: I had a lease on an OEDIPUS COMPLEX back in '81...
From: Andreas Schwab <schwab@suse.de>
Date: Sun, 27 Apr 2003 16:11:00 -0000
Message-ID: <m3el3o9ejw.fsf@whitebox.local>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-SW-Source: 2003-04/txt/msg00070.txt.bz2

The sysd-sorted rule didn't work in a subdirectory.

Andreas.

2003-04-27  Andreas Schwab  <schwab@suse.de>

	* Makeconfig ($(common-objpfx)sysd-sorted): Fix for running in
	subdirectory.

--- Makeconfig.~1.282.~	2003-04-16 23:05:35.000000000 +0200
+++ Makeconfig	2003-04-27 16:50:18.000000000 +0200
@@ -927,11 +927,11 @@ $(common-objpfx)sysd-dirs: $(common-objp
 all-Depend-files = $(wildcard $(..)*/Depend)
 $(common-objpfx)sysd-sorted: $(..)scripts/gen-sorted.awk $(all-Depend-files) \
 			     $(common-objpfx)sysd-dirs $(..)Makeconfig
-	{ { dirs='$(patsubst $(..)%/Depend,$(..)%,$(filter %/Depend,$^))';\
+	{ { dirs='$(patsubst $(..)%/Depend,%,$(filter %/Depend,$^))';	  \
 	    for d in $$dirs; do						  \
 	      while read on; do						  \
 		echo "depend $$d $$on";					  \
-	      done < $$d/Depend;					  \
+	      done < $(..)$$d/Depend;					  \
 	    done;							  \
 	    for f in $(all-subdirs); do					  \
 	      echo $$f;							  \