Skip to content

M
mariadb
Commit 8b8d3135 authored by unknown's avatar unknown
Browse files
Options

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

   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 .


innobase/btr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/buf/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/com/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/data/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/dict/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/dyn/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/eval/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fil/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fsp/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fut/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ha/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ibuf/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/include/Makefile.i:
   - removed libsdir = ../libs to fix a bug in "make DESTDIR=<dir> install"
     (the libs always got installed in "dir../")
innobase/lock/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/log/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mach/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mem/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mtr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/odbc/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/os/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/page/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/pars/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/que/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/read/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/rem/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/row/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/srv/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/sync/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/thr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/trx/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/usr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ut/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
parent d1048a22
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 33 deletions
innobase/btr/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libbtr.a noinst_LIBRARIES = libbtr.a
libbtr_a_SOURCES = btr0btr.c btr0cur.c btr0pcur.c btr0sea.c libbtr_a_SOURCES = btr0btr.c btr0cur.c btr0pcur.c btr0sea.c
......
innobase/buf/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libbuf.a noinst_LIBRARIES = libbuf.a
libbuf_a_SOURCES = buf0buf.c buf0flu.c buf0lru.c buf0rea.c libbuf_a_SOURCES = buf0buf.c buf0flu.c buf0lru.c buf0rea.c
......
innobase/com/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libcom.a noinst_LIBRARIES = libcom.a
libcom_a_SOURCES = com0com.c com0shm.c libcom_a_SOURCES = com0com.c com0shm.c
......
innobase/data/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libdata.a noinst_LIBRARIES = libdata.a
libdata_a_SOURCES = data0data.c data0type.c libdata_a_SOURCES = data0data.c data0type.c
......
innobase/dict/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libdict.a noinst_LIBRARIES = libdict.a
libdict_a_SOURCES = dict0boot.c dict0crea.c dict0dict.c dict0load.c\ libdict_a_SOURCES = dict0boot.c dict0crea.c dict0dict.c dict0load.c\
dict0mem.c dict0mem.c
......
innobase/dyn/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libdyn.a noinst_LIBRARIES = libdyn.a
libdyn_a_SOURCES = dyn0dyn.c libdyn_a_SOURCES = dyn0dyn.c
......
innobase/eval/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libeval.a noinst_LIBRARIES = libeval.a
libeval_a_SOURCES = eval0eval.c eval0proc.c libeval_a_SOURCES = eval0eval.c eval0proc.c
......
innobase/fil/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libfil.a noinst_LIBRARIES = libfil.a
libfil_a_SOURCES = fil0fil.c libfil_a_SOURCES = fil0fil.c
......
innobase/fsp/Makefile.am
View file @ 8b8d3135
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libfsp.a noinst_LIBRARIES = libfsp.a
libfsp_a_SOURCES = fsp0fsp.c libfsp_a_SOURCES = fsp0fsp.c
......
innobase/fut/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libfut.a noinst_LIBRARIES = libfut.a
libfut_a_SOURCES = fut0fut.c fut0lst.c libfut_a_SOURCES = fut0fut.c fut0lst.c
......
innobase/ha/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libha.a noinst_LIBRARIES = libha.a
libha_a_SOURCES = ha0ha.c hash0hash.c libha_a_SOURCES = ha0ha.c hash0hash.c
......
innobase/ibuf/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libibuf.a noinst_LIBRARIES = libibuf.a
libibuf_a_SOURCES = ibuf0ibuf.c libibuf_a_SOURCES = ibuf0ibuf.c
......
innobase/include/Makefile.i
View file @ 8b8d3135
# Makefile included in Makefile.am in every subdirectory # Makefile included in Makefile.am in every subdirectory
libsdir = ../libs
INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../../include -I../../include INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../../include -I../../include
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
......
innobase/lock/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = liblock.a noinst_LIBRARIES = liblock.a
liblock_a_SOURCES = lock0lock.c liblock_a_SOURCES = lock0lock.c
......
innobase/log/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = liblog.a noinst_LIBRARIES = liblog.a
liblog_a_SOURCES = log0log.c log0recv.c liblog_a_SOURCES = log0log.c log0recv.c
......
innobase/mach/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libmach.a noinst_LIBRARIES = libmach.a
libmach_a_SOURCES = mach0data.c libmach_a_SOURCES = mach0data.c
......
innobase/mem/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libmem.a noinst_LIBRARIES = libmem.a
libmem_a_SOURCES = mem0mem.c mem0pool.c libmem_a_SOURCES = mem0mem.c mem0pool.c
......
innobase/mtr/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libmtr.a noinst_LIBRARIES = libmtr.a
libmtr_a_SOURCES = mtr0mtr.c mtr0log.c libmtr_a_SOURCES = mtr0mtr.c mtr0log.c
......
innobase/odbc/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libodbc.a noinst_LIBRARIES = libodbc.a
libodbc_a_SOURCES = odbc0odbc.c libodbc_a_SOURCES = odbc0odbc.c
......
innobase/os/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i 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 libos_a_SOURCES = os0proc.c os0shm.c os0sync.c os0thread.c os0file.c
......
innobase/page/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libpage.a noinst_LIBRARIES = libpage.a
libpage_a_SOURCES = page0page.c page0cur.c libpage_a_SOURCES = page0page.c page0cur.c
......
innobase/pars/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libpars.a noinst_LIBRARIES = libpars.a
noinst_HEADERS = pars0grm.h noinst_HEADERS = pars0grm.h
......
innobase/que/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libque.a noinst_LIBRARIES = libque.a
libque_a_SOURCES = que0que.c libque_a_SOURCES = que0que.c
......
innobase/read/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libread.a noinst_LIBRARIES = libread.a
libread_a_SOURCES = read0read.c libread_a_SOURCES = read0read.c
......
innobase/rem/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = librem.a noinst_LIBRARIES = librem.a
librem_a_SOURCES = rem0rec.c rem0cmp.c librem_a_SOURCES = rem0rec.c rem0cmp.c
......
innobase/row/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i 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\ librow_a_SOURCES = row0ins.c row0mysql.c row0purge.c row0row.c row0sel.c\
row0uins.c row0umod.c row0undo.c row0upd.c row0vers.c row0uins.c row0umod.c row0undo.c row0upd.c row0vers.c
......
innobase/srv/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libsrv.a noinst_LIBRARIES = libsrv.a
libsrv_a_SOURCES = srv0srv.c srv0que.c srv0start.c libsrv_a_SOURCES = srv0srv.c srv0que.c srv0start.c
......
innobase/sync/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libsync.a noinst_LIBRARIES = libsync.a
libsync_a_SOURCES = sync0arr.c sync0ipm.c sync0rw.c sync0sync.c libsync_a_SOURCES = sync0arr.c sync0ipm.c sync0rw.c sync0sync.c
......
innobase/thr/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libthr.a noinst_LIBRARIES = libthr.a
libthr_a_SOURCES = thr0loc.c libthr_a_SOURCES = thr0loc.c
......
innobase/trx/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libtrx.a noinst_LIBRARIES = libtrx.a
libtrx_a_SOURCES = trx0purge.c trx0rec.c trx0roll.c trx0rseg.c\ libtrx_a_SOURCES = trx0purge.c trx0rec.c trx0roll.c trx0rseg.c\
trx0sys.c trx0trx.c trx0undo.c trx0sys.c trx0trx.c trx0undo.c
......
innobase/usr/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i include ../include/Makefile.i
libs_LIBRARIES = libusr.a noinst_LIBRARIES = libusr.a
libusr_a_SOURCES = usr0sess.c libusr_a_SOURCES = usr0sess.c
......
innobase/ut/Makefile.am
View file @ 8b8d3135
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
include ../include/Makefile.i 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 libut_a_SOURCES = ut0byte.c ut0dbg.c ut0mem.c ut0rnd.c ut0ut.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7