[PATCH] 2.4.1ac12 mkdep -I support - take 2

[PATCH] 2.4.1ac12 mkdep -I support - take 2

[Keith Owens]

Get rid of the special case in drivers/acpi/Makefile.  mkdep now uses
the same -I options in the same order as the compiler.  Against 2.4.1ac12.

Change from take 1 - make is too dumb to realise that /path/name/file.h
is the same as file.h when current directory is /path/name, so do not
use the full pathname to files in the current directory.

--- 2.4.1-ac12/scripts/mkdep.c.orig	Wed Feb 14 14:21:54 2001
+++ 2.4.1-ac12/scripts/mkdep.c	Sun Feb 11 15:06:46 2001
@@ -221,15 +221,10 @@
 	char resolved_path[PATH_MAX+1];
 	const char *name2;
 
-	if (strcmp(name, ".")) {
-		name2 = realpath(name, resolved_path);
-		if (!name2) {
-			fprintf(stderr, "realpath(%s) failed, %m\n", name);
-			exit(1);
-		}
-	}
-	else {
-		name2 = "";
+	name2 = realpath(name, resolved_path);
+	if (!name2) {
+		fprintf(stderr, "realpath(%s) failed, %m\n", name);
+		exit(1);
 	}
 
 	path_array = realloc(path_array, (++paths)*sizeof(*path_array));
@@ -246,7 +241,7 @@
 		exit(1);
 	}
 	strcpy(path->buffer, name2);
-	if (path->len && *(path->buffer+path->len-1) != '/') {
+	if (*(path->buffer+path->len-1) != '/') {
 		*(path->buffer+path->len) = '/';
 		*(path->buffer+(++(path->len))) = '\0';
 	}

Re: [PATCH] 2.4.1ac12 mkdep -I support - take 2

[Pavel Roskin]

Hello, Keith!

You patch has been applied to 2.4.1ac13, but it doesn't help:

$ HPATH=. ../../scripts/mkdep -- names.c
names.o: names.c \
   $(wildcard /home/proski/src/linux/drivers/pci/config/pci/names.h) \
   /home/proski/src/linux/drivers/pci/devlist.h \
   /home/proski/src/linux/drivers/pci/devlist.h \
   /home/proski/src/linux/drivers/pci/devlist.h
$ ls
Config.in  compat.o       names.c  pci.o     quirks.o     setup-res.c
Makefile   devlist.h      pci.c    proc.c    setup-bus.c  syscall.c
compat.c   gen-devlist.c  pci.ids  quirks.c  setup-irq.c

devlist.h is in the current directory, but the full path is used.

Regards,
Pavel Roskin

Re: [PATCH] 2.4.1ac12 mkdep -I support - take 2

[Pavel Roskin]

On Thu, 15 Feb 2001, Pavel Roskin wrote:

> Hello, Keith!
>
> You patch has been applied to 2.4.1ac13, but it doesn't help:

It's fixed in ac14. I ran twice

make depend && make clean && make bzImage && make modules

and it worked both times. Thanks!

Regards,
Pavel Roskin