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/innobase/Makefile.am | |
parent | f00d16a3325e5c28edfdb5aa9f1c4bf82d1fe1f9 (diff) | |
download | mariadb-git-2eff96e63127e846d210ba94b8b3fcdfe9d6e5e6.tar.gz |
make distcheck and cosmetic fixes
Diffstat (limited to 'storage/innobase/Makefile.am')
-rw-r--r-- | storage/innobase/Makefile.am | 11 |
1 files changed, 5 insertions, 6 deletions
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 |