Commit db0a4e89 authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.1-release 

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
parents 157a6470 c8acb2d8

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ else 
		  $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \

		else \

		  (for arc in ./libmysqld_int.a $(INC_LIB); do \

		    arpath=`echo $$arc|sed 's|[^/]*$$||'`; \

		    arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \

		    $(AR) t $$arc|xargs -n 1 find $$arpath -name; \

		    $(AR) t $$arc|xargs -n 1 find `dirname $$arpath` -path \*/`basename $$arpath`/\* -name; \

		  done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \