]>
Commit | Line | Data |
---|---|---|
909a98b0 JB |
1 | --- lsvpd-1.0.3/Makefile.am.orig 2007-02-13 00:21:51.000000000 +0100 |
2 | +++ lsvpd-1.0.3/Makefile.am 2007-02-18 12:55:47.609817984 +0100 | |
3 | @@ -25,7 +25,7 @@ | |
4 | ||
5 | lib_LTLIBRARIES = libvpd-1.0.la | |
6 | ||
7 | -library_includedir=/usr/$(includedir)/libvpd-1/ | |
8 | +library_includedir=$(includedir)/libvpd-1/ | |
9 | library_include_HEADERS = $(lib_h_files) | |
10 | ||
11 | INCLUDES = -I./src/include | |
12 | @@ -70,33 +70,27 @@ | |
13 | ||
14 | lsmcode_SOURCES = src/output/lsmcode.cpp \ | |
15 | $(lib_h_files) | |
16 | - | |
17 | -vpdupdate_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz /usr/lib/libsgutils.a ./libvpd-1.0.la | |
18 | + | |
19 | +LIBDB=-ldb_cxx-4.5 | |
20 | + | |
21 | +vpdupdate_LDADD = $(LIBDB) -lstdc++ -lz -lsgutils ./libvpd-1.0.la | |
22 | vpdupdate_LDFLAGS = -Wall | |
23 | -lsvpd_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la | |
24 | +lsvpd_LDADD = $(LIBDB) -lstdc++ -lz ./libvpd-1.0.la | |
25 | lsvpd_LDFLAGS = -Wall | |
26 | -lscfg_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la | |
27 | +lscfg_LDADD = $(LIBDB) -lstdc++ -lz ./libvpd-1.0.la | |
28 | lscfg_LDFLAGS = -Wall | |
29 | -lsvio_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la | |
30 | +lsvio_LDADD = $(LIBDB) -lstdc++ -lz ./libvpd-1.0.la | |
31 | lsvio_LDFLAGS = -Wall | |
32 | -lsmcode_LDADD = -L. -ldb_cxx-4.2 -lstdc++ -lz ./libvpd-1.0.la | |
33 | +lsmcode_LDADD = $(LIBDB) -lstdc++ -lz ./libvpd-1.0.la | |
34 | lsmcode_LDFLAGS = -Wall | |
35 | ||
36 | -libvpd_1_0_la_LDFLAGS = -module | |
37 | +libvpd_1_0_la_LIBADD = $(LIBDB) | |
38 | ||
39 | AM_CXXFLAGS = -DDEST_DIR='"${exec_prefix}"' -DVPD_VERSION='"@VERSION@"' | |
40 | ||
41 | -if PCI_IDS_LOC | |
42 | -AM_CXXFLAGS += -DPCI_IDS='"/usr/share/pci.ids"' | |
43 | -else | |
44 | -AM_CXXFLAGS += -DPCI_IDS='"/usr/share/misc/pci.ids"' | |
45 | -endif | |
46 | +AM_CXXFLAGS += -DPCI_IDS='"/etc/pci.ids"' | |
47 | ||
48 | -if USB_IDS_LOC | |
49 | -AM_CXXFLAGS += -DUSB_IDS='"/usr/share/usb.ids"' | |
50 | -else | |
51 | AM_CXXFLAGS += -DUSB_IDS='"/usr/share/misc/usb.ids"' | |
52 | -endif | |
53 | ||
54 | if DB_CXX_H4_2 | |
55 | AM_CXXFLAGS += -DDB_CXX='<db4.2/db_cxx.h>' |