]>
Commit | Line | Data |
---|---|---|
b1cb8d42 JB |
1 | --- lsvpd-1.6.11/Makefile.am.orig 2011-06-16 00:59:59.000000000 +0200 |
2 | +++ lsvpd-1.6.11/Makefile.am 2011-09-23 19:29:44.906120445 +0200 | |
7a8d4c54 | 3 | @@ -40,7 +40,7 @@ |
909a98b0 | 4 | lsmcode_SOURCES = src/output/lsmcode.cpp \ |
7a8d4c54 JB |
5 | $(update_h_files) |
6 | ||
b1cb8d42 JB |
7 | -vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx -lsgutils |
8 | +vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx -lsgutils2 | |
909a98b0 | 9 | vpdupdate_LDFLAGS = -Wall |
b1cb8d42 | 10 | lsvpd_LDADD = -lz -lstdc++ -lvpd_cxx |
909a98b0 | 11 | lsvpd_LDFLAGS = -Wall |
7a8d4c54 | 12 | @@ -53,25 +53,9 @@ |
909a98b0 JB |
13 | |
14 | AM_CXXFLAGS = -DDEST_DIR='"${exec_prefix}"' -DVPD_VERSION='"@VERSION@"' | |
15 | ||
16 | -if PCI_IDS_LOC | |
17 | -AM_CXXFLAGS += -DPCI_IDS='"/usr/share/pci.ids"' | |
18 | -else | |
7a8d4c54 JB |
19 | -if PCI_IDS_LOC2 |
20 | -AM_CXXFLAGS += -DPCI_IDS='"/usr/share/hwdata/pci.ids"' | |
21 | -else | |
909a98b0 JB |
22 | -AM_CXXFLAGS += -DPCI_IDS='"/usr/share/misc/pci.ids"' |
23 | -endif | |
7a8d4c54 | 24 | -endif |
b1cb8d42 | 25 | - |
909a98b0 JB |
26 | -if USB_IDS_LOC |
27 | -AM_CXXFLAGS += -DUSB_IDS='"/usr/share/usb.ids"' | |
7a8d4c54 JB |
28 | -else |
29 | -if USB_IDS_LOC2 | |
30 | -AM_CXXFLAGS += -DUSB_IDS='"/usr/share/hwdata/usb.ids"' | |
909a98b0 | 31 | -else |
7d6fa36b | 32 | -AM_CXXFLAGS += -DUSB_IDS='"/usr/share/misc/usb.ids"' |
909a98b0 | 33 | -endif |
7a8d4c54 | 34 | -endif |
b1cb8d42 JB |
35 | +AM_CXXFLAGS += -DPCI_IDS='"/etc/pci.ids"' |
36 | + | |
7d6fa36b | 37 | +AM_CXXFLAGS += -DUSB_IDS='"/etc/usb.ids"' |
7a8d4c54 JB |
38 | |
39 | SUBDIRS = docs | |
909a98b0 | 40 |