diff options
| author | David Nusinow <dnusinow@debian.org> | 2007-10-22 21:30:04 -0400 |
|---|---|---|
| committer | David Nusinow <dnusinow@debian.org> | 2007-10-22 21:30:04 -0400 |
| commit | d808d653d1fc16f1d5af76ab00fa862fb80fa3ba (patch) | |
| tree | 0e86cadf01f83e366614589c034f7e69088125d7 /hw/xfree86 | |
| parent | 29e0e180729a4f0cc020985a4de4c8bc4b9c7f5f (diff) | |
Define PCI_TXT_IDS_DIR more cleanly
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/common/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86AutoConfig.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index 05c088c96..db726fea1 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -94,6 +94,4 @@ if LNXACPI XORG_CFLAGS += -DHAVE_ACPI endif -XORG_CFLAGS += -DPCITXTIDSPATH=\"$(PCI_TXT_IDS_PATH)\" - AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index 29f1279fa..c5998bfb8 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -347,9 +347,9 @@ matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip uint16_t vendor, chip; int i, j; - idsdir = opendir(PCITXTIDSPATH); + idsdir = opendir(PCI_TXT_IDS_PATH); if (idsdir) { - xf86Msg(X_INFO, "Scanning %s directory for additional PCI ID's supported by the drivers\n", PCITXTIDSPATH); + xf86Msg(X_INFO, "Scanning %s directory for additional PCI ID's supported by the drivers\n", PCI_TXT_IDS_PATH); direntry = readdir(idsdir); /* Read the directory */ while (direntry) { @@ -361,7 +361,7 @@ matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip /* A tiny bit of sanity checking. We should probably do better */ if (strncmp(&(direntry->d_name[len-4]), ".ids", 4) == 0) { /* We need the full path name to open the file */ - strncpy(path_name, PCITXTIDSPATH, 256); + strncpy(path_name, PCI_TXT_IDS_PATH, 256); strncat(path_name, "/", 1); strncat(path_name, direntry->d_name, (256 - strlen(path_name) - 1)); fp = fopen(path_name, "r"); |