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

From: Keith Owens (kaos@ocs.com.au)
Date: Tue Feb 13 2001 - 22:41:38 EST


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';
         }

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Feb 15 2001 - 21:00:23 EST