]>
Commit | Line | Data |
---|---|---|
3191bb0d MT |
1 | diff -up gdbm-1.8.3/Makefile.in.fhs gdbm-1.8.3/Makefile.in |
2 | --- gdbm-1.8.3/Makefile.in.fhs 2002-10-08 18:09:12.000000000 +0200 | |
3 | +++ gdbm-1.8.3/Makefile.in 2010-03-10 15:41:01.516025096 +0100 | |
4 | @@ -1,7 +1,7 @@ | |
5 | #### Start of system configuration section. #### | |
6 | ||
7 | srcdir = @srcdir@ | |
8 | -top_builddir = . | |
9 | +top_builddir = @top_builddir@ | |
10 | VPATH = @srcdir@ | |
11 | ||
12 | CC = @CC@ | |
13 | @@ -14,17 +14,13 @@ INSTALL = @INSTALL@ | |
14 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
15 | INSTALL_DATA = @INSTALL_DATA@ | |
16 | ||
17 | -# File ownership and group | |
18 | -BINOWN = bin | |
19 | -BINGRP = bin | |
20 | - | |
21 | MAKEINFO = makeinfo | |
22 | TEXI2DVI = texi2dvi | |
23 | ||
24 | -DEFS = | |
25 | +DEFS = @DEFS@ | |
26 | ||
27 | # Where the system [n]dbm routines are... | |
28 | -LIBS = @LIBS@ -lc | |
29 | +LIBS = @LIBS@ | |
30 | ||
31 | CFLAGS = @CFLAGS@ | |
32 | LDFLAGS = @LDFLAGS@ | |
33 | @@ -32,16 +28,17 @@ LDFLAGS = @LDFLAGS@ | |
34 | # Common prefix for installation directories | |
35 | prefix = @prefix@ | |
36 | exec_prefix = @exec_prefix@ | |
37 | -binprefix = $(exec_prefix) | |
38 | -manprefix = $(prefix) | |
39 | +datarootdir = @datarootdir@ | |
40 | ||
41 | # Directory in which to put libgdbm.a. | |
42 | libdir = @libdir@ | |
43 | # The include directory for gdbm.h and dbm.h. | |
44 | includedir = @includedir@ | |
45 | +pkgincludedir = $(includedir)/gdbm | |
46 | # Info and man directories. | |
47 | infodir = @infodir@ | |
48 | -man3dir = @mandir@/man3 | |
49 | +mandir = @mandir@ | |
50 | +man3dir = $(mandir)/man3 | |
51 | manext = 3 | |
52 | ||
53 | #### End of system configuration section. #### | |
54 | @@ -57,7 +54,7 @@ manext = 3 | |
55 | ||
56 | SHELL = /bin/sh | |
57 | ||
58 | -PROGS = libgdbm.la testgdbm testdbm testndbm tndbm tdbm conv2gdbm | |
59 | +PROGS = libgdbm.la testgdbm testdbm testndbm conv2gdbm | |
60 | ||
61 | DBM_CF = dbminit.c delete.c fetch.c store.c seq.c close.c | |
62 | ||
63 | @@ -127,26 +124,17 @@ all: libgdbm.la libgdbm_compat.la | |
64 | progs: $(PROGS) | |
65 | ||
66 | install: libgdbm.la gdbm.h gdbm.info | |
67 | - $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ | |
68 | - $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ | |
69 | - $(INSTALL_ROOT)$(infodir) | |
70 | - $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la | |
71 | - $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ | |
72 | - $(INSTALL_ROOT)$(includedir)/gdbm.h | |
73 | - $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ | |
74 | - $(INSTALL_ROOT)$(man3dir)/gdbm.3 | |
75 | - $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ | |
76 | - $(INSTALL_ROOT)$(infodir)/gdbm.info | |
77 | + $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) $(man3dir) $(infodir) | |
78 | + $(LIBTOOL) install install libgdbm.la $(libdir)/libgdbm.la | |
79 | + $(INSTALL_DATA) gdbm.h $(pkgincludedir)/gdbm.h | |
80 | + $(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3 | |
81 | + $(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info | |
82 | ||
83 | install-compat: | |
84 | - $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ | |
85 | - $(INSTALL_ROOT)$(includedir) | |
86 | - $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ | |
87 | - $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la | |
88 | - $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ | |
89 | - $(INSTALL_ROOT)$(includedir)/dbm.h | |
90 | - $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ | |
91 | - $(INSTALL_ROOT)$(includedir)/ndbm.h | |
92 | + $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) | |
93 | + $(LIBTOOL) install install libgdbm_compat.la $(libdir)/libgdbm_compat.la | |
94 | + $(INSTALL_DATA) $(srcdir)/dbm.h $(pkgincludedir)/dbm.h | |
95 | + $(INSTALL_DATA) $(srcdir)/ndbm.h $(pkgincludedir)/ndbm.h | |
96 | ||
97 | #libgdbm.a: $(OBJS) gdbm.h | |
98 | # rm -f libgdbm.a | |
99 | @@ -161,7 +149,7 @@ libgdbm.la: $(LOBJS) gdbm.h | |
100 | libgdbm_compat.la: $(C_LOBJS) gdbm.h | |
101 | rm -f libgdbm_compat.la | |
102 | $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \ | |
103 | - -version-info $(SHLIB_VER) $(C_LOBJS) | |
104 | + -version-info $(SHLIB_VER) $(C_LOBJS) -lgdbm | |
105 | ||
106 | gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 | |
107 | rm -f gdbm.h | |
108 | @@ -172,10 +160,10 @@ gdbm.h: gdbm.proto gdbmerrno.h gdbm.prot | |
109 | chmod -w gdbm.h | |
110 | ||
111 | testgdbm: testgdbm.o libgdbm.la @LIBOBJS@ | |
112 | - $(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ | |
113 | + $(LIBTOOL) link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ | |
114 | ||
115 | testdbm: testdbm.o libgdbm.la libgdbm_compat.la | |
116 | - $(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la | |
117 | + $(LIBTOOL) link $(CC) $(LDFLAGS) -o testdbm testdbm.o $(LIBS) libgdbm_compat.la | |
118 | ||
119 | tdbm: testdbm.o | |
120 | $(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS) | |
121 | @@ -184,7 +172,7 @@ testndbm.o: testndbm.c | |
122 | $(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c | |
123 | ||
124 | testndbm: testndbm.o libgdbm.la libgdbm_compat.la | |
125 | - $(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la | |
126 | + $(LIBTOOL) link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm_compat.la | |
127 | ||
128 | tndbm.o: testndbm.c | |
129 | cp $(srcdir)/testndbm.c ./tndbm.c | |
130 | @@ -195,7 +183,7 @@ tndbm: tndbm.o | |
131 | $(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS) | |
132 | ||
133 | conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@ | |
134 | - $(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@ | |
135 | + $(LIBTOOL) link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm_compat.la @LIBOBJS@ | |
136 | ||
137 | lintgdbm: | |
138 | lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c |