diff options
| author | unknown <serg@sergbook.mysql.com> | 2006-04-29 09:33:34 -0700 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2006-04-29 09:33:34 -0700 |
| commit | 2eff96e63127e846d210ba94b8b3fcdfe9d6e5e6 (patch) | |
| tree | 9782a6d5be7e71e163debffafd229f388bdc536b /storage | |
| parent | f00d16a3325e5c28edfdb5aa9f1c4bf82d1fe1f9 (diff) | |
| download | mariadb-git-2eff96e63127e846d210ba94b8b3fcdfe9d6e5e6.tar.gz | |
make distcheck and cosmetic fixes
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/archive/Makefile.am | 8 | ||||
| -rw-r--r-- | storage/blackhole/Makefile.am | 2 | ||||
| -rw-r--r-- | storage/example/Makefile.am | 2 | ||||
| -rw-r--r-- | storage/innobase/Makefile.am | 11 |
4 files changed, 11 insertions, 12 deletions
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am index 0920fe1a897..4263d8f2659 100644 --- a/storage/archive/Makefile.am +++ b/storage/archive/Makefile.am @@ -20,7 +20,7 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) MYSQLLIBdir= $(pkglibdir) -INCLUDES = -I$(top_srcdir)/include \ +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ -I$(top_srcdir)/regex \ -I$(top_srcdir)/sql \ -I$(srcdir) @ZLIB_INCLUDES@ @@ -50,9 +50,9 @@ libarchive_a_SOURCES = ha_archive.cc azio.c archive_test_SOURCES = archive_test.c azio.c archive_test_CFLAGS = $(AM_CFLAGS) -archive_test_LDADD = $(top_srcdir)/mysys/libmysys.a \ - $(top_srcdir)/dbug/libdbug.a \ - $(top_srcdir)/strings/libmystrings.a \ +archive_test_LDADD = $(top_builddir)/mysys/libmysys.a \ + $(top_builddir)/dbug/libdbug.a \ + $(top_builddir)/strings/libmystrings.a \ @ZLIB_LIBS@ archive_test_LDFLAGS = @NOINST_LDFLAGS@ diff --git a/storage/blackhole/Makefile.am b/storage/blackhole/Makefile.am index 060eaffce66..3a235bc86dd 100644 --- a/storage/blackhole/Makefile.am +++ b/storage/blackhole/Makefile.am @@ -20,7 +20,7 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) MYSQLLIBdir= $(pkglibdir) -INCLUDES = -I$(top_srcdir)/include \ +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ -I$(top_srcdir)/regex \ -I$(top_srcdir)/sql \ -I$(srcdir) diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am index 5565c5e85fc..f97dcc09e6b 100644 --- a/storage/example/Makefile.am +++ b/storage/example/Makefile.am @@ -20,7 +20,7 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) MYSQLLIBdir= $(pkglibdir) -INCLUDES = -I$(top_srcdir)/include \ +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ -I$(top_srcdir)/regex \ -I$(top_srcdir)/sql \ -I$(srcdir) diff --git a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am index 7a999b2f4fe..908f5d669a2 100644 --- a/storage/innobase/Makefile.am +++ b/storage/innobase/Makefile.am @@ -98,13 +98,12 @@ libinnobase.a: $(libinnobase_a_LIBADD) -rm -f $@ if test "$(host_os)" = "netware" ; \ then \ - $(libmysqld_a_AR) $@ $(libinnobase_a_LIBADD) ; \ + $(libinnobase_a_AR) $@ $(libinnobase_a_LIBADD) ; \ else \ - (for arc in $(libinnobase_a_LIBADD); do \ - arpath=`echo $$arc|sed 's|[^/]*$$||'`; \ - $(AR) t $$arc|xargs -n 1 find $$arpath -name; \ - $(AR) t $$arc|xargs -n 1 find `dirname $$arpath` -path \*/`basename $$arpath`/\* -name; \ - done ) | sort -u | xargs $(AR) cq $@ ; \ + for arc in $(libinnobase_a_LIBADD); do \ + arpath=`echo $$arc|sed 's|[^/]*$$||'`; \ + $(AR) t $$arc|sed "s|^|$$arpath|"; \ + done | sort -u | xargs $(AR) cq $@ ; \ $(RANLIB) $@ ; \ fi |