mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 00:24:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed bug in "make DESTDIR=<dir> install" - the InnoDB static

Browse source 
libraries always ended up in "dir..", even though they were not supposed
   to be installed anyway (they are only required at link time). Fixed it by
   replacing libs_LIBRARIES with noinst_LIBRARIES for all InnoDB Makefile.am 
   files and by removing "libsdir = " from innobase/include/Makefile.i .
This commit is contained in:
lenz@mysql.com 2003-04-10 20:03:52 +02:00
commit dbe145f015
32 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
innobase/btr/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libbtr.a
noinst_LIBRARIES = libbtr.a
libbtr_a_SOURCES = btr0btr.c btr0cur.c btr0pcur.c btr0sea.c

2
innobase/buf/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libbuf.a
noinst_LIBRARIES = libbuf.a
libbuf_a_SOURCES = buf0buf.c buf0flu.c buf0lru.c buf0rea.c

2
innobase/com/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libcom.a
noinst_LIBRARIES = libcom.a
libcom_a_SOURCES = com0com.c com0shm.c

2
innobase/data/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libdata.a
noinst_LIBRARIES = libdata.a
libdata_a_SOURCES = data0data.c data0type.c

2
innobase/dict/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libdict.a
noinst_LIBRARIES = libdict.a
libdict_a_SOURCES = dict0boot.c dict0crea.c dict0dict.c dict0load.c\
dict0mem.c

2
innobase/dyn/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libdyn.a
noinst_LIBRARIES = libdyn.a
libdyn_a_SOURCES = dyn0dyn.c

2
innobase/eval/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libeval.a
noinst_LIBRARIES = libeval.a
libeval_a_SOURCES = eval0eval.c eval0proc.c

2
innobase/fil/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libfil.a
noinst_LIBRARIES = libfil.a
libfil_a_SOURCES = fil0fil.c

2
innobase/fsp/Makefile.am
View file

@ -18,7 +18,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libfsp.a
noinst_LIBRARIES = libfsp.a
libfsp_a_SOURCES = fsp0fsp.c

2
innobase/fut/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libfut.a
noinst_LIBRARIES = libfut.a
libfut_a_SOURCES = fut0fut.c fut0lst.c

2
innobase/ha/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libha.a
noinst_LIBRARIES = libha.a
libha_a_SOURCES = ha0ha.c hash0hash.c

2
innobase/ibuf/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libibuf.a
noinst_LIBRARIES = libibuf.a
libibuf_a_SOURCES = ibuf0ibuf.c

2
innobase/include/Makefile.i
View file

@ -1,7 +1,5 @@
# Makefile included in Makefile.am in every subdirectory
libsdir = ../libs
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../../include -I../../include
# Don't update the files from bitkeeper

2
innobase/lock/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = liblock.a
noinst_LIBRARIES = liblock.a
liblock_a_SOURCES = lock0lock.c

2
innobase/log/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = liblog.a
noinst_LIBRARIES = liblog.a
liblog_a_SOURCES = log0log.c log0recv.c

2
innobase/mach/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libmach.a
noinst_LIBRARIES = libmach.a
libmach_a_SOURCES = mach0data.c

2
innobase/mem/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libmem.a
noinst_LIBRARIES = libmem.a
libmem_a_SOURCES = mem0mem.c mem0pool.c

2
innobase/mtr/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libmtr.a
noinst_LIBRARIES = libmtr.a
libmtr_a_SOURCES = mtr0mtr.c mtr0log.c

2
innobase/odbc/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libodbc.a
noinst_LIBRARIES = libodbc.a
libodbc_a_SOURCES = odbc0odbc.c

2
innobase/os/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libos.a
noinst_LIBRARIES = libos.a
libos_a_SOURCES = os0proc.c os0shm.c os0sync.c os0thread.c os0file.c

2
innobase/page/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libpage.a
noinst_LIBRARIES = libpage.a
libpage_a_SOURCES = page0page.c page0cur.c

2
innobase/pars/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libpars.a
noinst_LIBRARIES = libpars.a
noinst_HEADERS = pars0grm.h

2
innobase/que/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libque.a
noinst_LIBRARIES = libque.a
libque_a_SOURCES = que0que.c

2
innobase/read/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libread.a
noinst_LIBRARIES = libread.a
libread_a_SOURCES = read0read.c

2
innobase/rem/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = librem.a
noinst_LIBRARIES = librem.a
librem_a_SOURCES = rem0rec.c rem0cmp.c

2
innobase/row/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = librow.a
noinst_LIBRARIES = librow.a
librow_a_SOURCES = row0ins.c row0mysql.c row0purge.c row0row.c row0sel.c\
row0uins.c row0umod.c row0undo.c row0upd.c row0vers.c

2
innobase/srv/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libsrv.a
noinst_LIBRARIES = libsrv.a
libsrv_a_SOURCES = srv0srv.c srv0que.c srv0start.c

2
innobase/sync/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libsync.a
noinst_LIBRARIES = libsync.a
libsync_a_SOURCES = sync0arr.c sync0ipm.c sync0rw.c sync0sync.c

2
innobase/thr/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libthr.a
noinst_LIBRARIES = libthr.a
libthr_a_SOURCES = thr0loc.c

2
innobase/trx/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libtrx.a
noinst_LIBRARIES = libtrx.a
libtrx_a_SOURCES = trx0purge.c trx0rec.c trx0roll.c trx0rseg.c\
trx0sys.c trx0trx.c trx0undo.c

2
innobase/usr/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libusr.a
noinst_LIBRARIES = libusr.a
libusr_a_SOURCES = usr0sess.c

2
innobase/ut/Makefile.am
View file

@ -17,7 +17,7 @@
include ../include/Makefile.i
libs_LIBRARIES = libut.a
noinst_LIBRARIES = libut.a
libut_a_SOURCES = ut0byte.c ut0dbg.c ut0mem.c ut0rnd.c ut0ut.c