Fix for make dist

innobase/include/Makefile.am

@@ -55,5 +55,7 @@ noinst_HEADERS = btr0btr.h btr0btr.ic btr0cur.h btr0cur.ic \
         ut0dbg.h ut0lst.h ut0mem.h ut0mem.ic ut0rnd.h ut0rnd.ic \
         ut0sort.h ut0ut.h ut0ut.ic
 
+EXTRA_DIST = Makefile.i
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%

innobase/include/Makefile.i

@@ -2,7 +2,7 @@
 
 libsdir = ../libs
 
-INCLUDES =		-I../../include -I../include
+INCLUDES =		-I$(srcdir)/../include -I$(srcdir)/../../include -I../../include
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

libmysql/Makefile.am

@@ -71,11 +71,11 @@ link_sources:
 # keep only the stubs for safemalloc.c and debug.c
 #
 # A list of needed headers collected from the deps information 000213
-nh =		global.h config-win32.h dbug.h errmsg.h global.h \
+nh =		my_global.h config-win32.h dbug.h errmsg.h \
 		m_ctype.h m_string.h \
 		my_alarm.h my_config.h my_dir.h my_list.h my_net.h my_sys.h \
-		mysql.h mysql_com.h mysql_version.h mysqld_error.h mysys_err.h \
-		my_pthread.h thr_alarm.h violite.h hash.h
+		mysql.h mysql_com.h mysql_version.h mysqld_error.h \
+		mysys_err.h my_pthread.h thr_alarm.h violite.h hash.h
 # Get a list of the needed objects  
 lobjs = $(mysysobjects1) $(dbugobjects) $(mystringsobjects)
 

support-files/mysql.server.sh

@@ -118,7 +118,7 @@ case "$mode" in
   'stop')
     # Stop daemon. We use a signal here to avoid having to know the
     # root password.
-    if test -f "$pid_file"
+    if test -s "$pid_file"
     then
       mysqld_pid=`cat $pid_file`
       echo "Killing mysqld with pid $mysqld_pid"