*** bash-2.05a/Makefile.in.orig	Tue Feb 12 18:22:38 2002
--- bash-2.05a/Makefile.in	Tue Feb 12 18:43:15 2002
***************
*** 16,21 ****
--- 16,59 ----
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
  
+ #===================================================================
+ # Thie 'Makefile.in' was modified by SAKAIDA Masaaki.
+ #
+ # Change Logs
+ # 1. Add EXEC_SQL functions, 'exec_sql.def' and 'exec_sql/Makefile'.
+ # 2. Modify Program 'bash' to 'pgbash'.
+ # 3. Delete Program 'bashbug'and 'man' configuration.
+ # 4. Add  $(POSTGRESQL_LIB) into $(Program).
+ # 5. Change 'declare.o' to 'declares.o'.
+ # 6. Delete $(srcdir)/configure and 'reconfig'.
+ #
+ #===================================================================
+ #
+ EXEC_SQL_DIR   = ../exec_sql
+ #POSTGRESQL_LIBS= /usr/local/pgsql/lib/libpq.so
+ POSTGRESQL_LIBS= @pglib_prefix@/libpq.so
+ PGBASHRC_DIR   = @srcdir@/../../rc
+ PGBASHRC       = pgbashrc
+ EXEC_SQL_OFILES= $(EXEC_SQL_DIR)/exec_sql_init.o $(EXEC_SQL_DIR)/exec_sql_main.o \
+       $(EXEC_SQL_DIR)/print_sub.o   $(EXEC_SQL_DIR)/psql_sub.o  \
+       $(EXEC_SQL_DIR)/sql_connect.o $(EXEC_SQL_DIR)/sql_copy.o  \
+       $(EXEC_SQL_DIR)/sql_fetch.o   $(EXEC_SQL_DIR)/uncgi_sub.o \
+       $(EXEC_SQL_DIR)/utils.o       $(EXEC_SQL_DIR)/sql_set.o
+ EXEC_SQL_SRC   = $(EXEC_SQL_DIR)/exec_sql_init.c $(EXEC_SQL_DIR)/exec_sql_main.c \
+       $(EXEC_SQL_DIR)/print_sub.c   $(EXEC_SQL_DIR)/psql_sub.c  \
+       $(EXEC_SQL_DIR)/sql_connect.c $(EXEC_SQL_DIR)/sql_copy.c  \
+       $(EXEC_SQL_DIR)/sql_fetch.c   $(EXEC_SQL_DIR)/uncgi_sub.c \
+       $(EXEC_SQL_DIR)/utils.c       $(EXEC_SQL_DIR)/sql_set.c
+ EXEC_SQL_H      = \
+       $(EXEC_SQL_DIR)/exec_sql.h     $(EXEC_SQL_DIR)/print_sub.h   \
+       $(EXEC_SQL_DIR)/psql_sub.h     $(EXEC_SQL_DIR)/sql_errno.h   \
+       $(EXEC_SQL_DIR)/sql_help.h     $(EXEC_SQL_DIR)/sql_connect.h \
+       $(EXEC_SQL_DIR)/sql_copy.h     $(EXEC_SQL_DIR)/sql_fetch.h   \
+       $(EXEC_SQL_DIR)/sqlca.h        $(EXEC_SQL_DIR)/utils.h       \
+       $(EXEC_SQL_DIR)/version.h      $(EXEC_SQL_DIR)/sql_set.h
+ etcdir = /etc
+ #---------------------------------------------------------------------
+ 
  # Make sure the first target in the makefile is the right one
  all: .made
  
***************
*** 83,89 ****
  VERSPROG = bashversion$(EXEEXT)
  VERSOBJ = bashversion.$(OBJEXT)
  
! Program = bash$(EXEEXT)
  Version = @BASHVERS@
  PatchLevel = `$(BUILD_DIR)/$(VERSPROG) -p`
  RELSTATUS = release
--- 121,127 ----
  VERSPROG = bashversion$(EXEEXT)
  VERSOBJ = bashversion.$(OBJEXT)
  
! Program = pgbash
  Version = @BASHVERS@
  PatchLevel = `$(BUILD_DIR)/$(VERSPROG) -p`
  RELSTATUS = release
***************
*** 373,379 ****
  	   trap.o input.o unwind_prot.o pathexp.o sig.o test.o version.o \
  	   alias.o array.o arrayfunc.o braces.o bracecomp.o bashhist.o \
  	   bashline.o $(SIGLIST_O) list.o stringlib.o locale.o findcmd.o redir.o \
! 	   pcomplete.o pcomplib.o syntax.o xmalloc.o
  
  # Where the source code of the shell builtins resides.
  BUILTIN_SRCDIR=$(srcdir)/builtins
--- 411,418 ----
  	   trap.o input.o unwind_prot.o pathexp.o sig.o test.o version.o \
  	   alias.o array.o arrayfunc.o braces.o bracecomp.o bashhist.o \
  	   bashline.o $(SIGLIST_O) list.o stringlib.o locale.o findcmd.o redir.o \
! 	   pcomplete.o pcomplib.o syntax.o xmalloc.o \
! 	   $(EXEC_SQL_OFILES)
  
  # Where the source code of the shell builtins resides.
  BUILTIN_SRCDIR=$(srcdir)/builtins
***************
*** 395,420 ****
  	       $(DEFSRC)/times.def $(DEFSRC)/trap.def $(DEFSRC)/type.def \
  	       $(DEFSRC)/ulimit.def $(DEFSRC)/umask.def $(DEFSRC)/wait.def \
  	       $(DEFSRC)/getopts.def $(DEFSRC)/reserved.def \
! 	       $(DEFSRC)/pushd.def $(DEFSRC)/shopt.def $(DEFSRC)/printf.def
  BUILTIN_C_SRC  = $(DEFSRC)/mkbuiltins.c $(DEFSRC)/common.c \
  		 $(DEFSRC)/evalstring.c $(DEFSRC)/evalfile.c \
  		 $(DEFSRC)/bashgetopt.c $(GETOPT_SOURCE)
  BUILTIN_C_OBJ  = $(DEFDIR)/common.o $(DEFDIR)/evalstring.o \
  		 $(DEFDIR)/evalfile.o $(DEFDIR)/bashgetopt.o
  BUILTIN_OBJS = $(DEFDIR)/alias.o $(DEFDIR)/bind.o $(DEFDIR)/break.o \
  	       $(DEFDIR)/builtin.o $(DEFDIR)/cd.o $(DEFDIR)/colon.o \
! 	       $(DEFDIR)/command.o $(DEFDIR)/declare.o \
  	       $(DEFDIR)/echo.o $(DEFDIR)/enable.o $(DEFDIR)/eval.o \
  	       $(DEFDIR)/exec.o $(DEFDIR)/exit.o $(DEFDIR)/fc.o \
  	       $(DEFDIR)/fg_bg.o $(DEFDIR)/hash.o $(DEFDIR)/help.o \
  	       $(DEFDIR)/history.o $(DEFDIR)/jobs.o $(DEFDIR)/kill.o \
  	       $(DEFDIR)/let.o $(DEFDIR)/pushd.o $(DEFDIR)/read.o \
  	       $(DEFDIR)/return.o $(DEFDIR)/shopt.o $(DEFDIR)/printf.o \
! 	       $(DEFDIR)/set.o $(DEFDIR)/setattr.o $(DEFDIR)/shift.o \
  	       $(DEFDIR)/source.o $(DEFDIR)/suspend.o $(DEFDIR)/test.o \
  	       $(DEFDIR)/times.o $(DEFDIR)/trap.o $(DEFDIR)/type.o \
  	       $(DEFDIR)/ulimit.o $(DEFDIR)/umask.o $(DEFDIR)/wait.o \
  	       $(DEFDIR)/getopts.o $(BUILTIN_C_OBJ)
  GETOPT_SOURCE   = $(DEFSRC)/getopt.c $(DEFSRC)/getopt.h
  PSIZE_SOURCE	= $(DEFSRC)/psize.sh $(DEFSRC)/psize.c
  
--- 434,464 ----
  	       $(DEFSRC)/times.def $(DEFSRC)/trap.def $(DEFSRC)/type.def \
  	       $(DEFSRC)/ulimit.def $(DEFSRC)/umask.def $(DEFSRC)/wait.def \
  	       $(DEFSRC)/getopts.def $(DEFSRC)/reserved.def \
! 	       $(DEFSRC)/pushd.def $(DEFSRC)/shopt.def $(DEFSRC)/printf.def \
! 	       $(DEFSRC)/exec_sql.def
! 
  BUILTIN_C_SRC  = $(DEFSRC)/mkbuiltins.c $(DEFSRC)/common.c \
  		 $(DEFSRC)/evalstring.c $(DEFSRC)/evalfile.c \
  		 $(DEFSRC)/bashgetopt.c $(GETOPT_SOURCE)
+ 
  BUILTIN_C_OBJ  = $(DEFDIR)/common.o $(DEFDIR)/evalstring.o \
  		 $(DEFDIR)/evalfile.o $(DEFDIR)/bashgetopt.o
+ 
  BUILTIN_OBJS = $(DEFDIR)/alias.o $(DEFDIR)/bind.o $(DEFDIR)/break.o \
  	       $(DEFDIR)/builtin.o $(DEFDIR)/cd.o $(DEFDIR)/colon.o \
! 	       $(DEFDIR)/command.o $(DEFDIR)/declares.o \
  	       $(DEFDIR)/echo.o $(DEFDIR)/enable.o $(DEFDIR)/eval.o \
  	       $(DEFDIR)/exec.o $(DEFDIR)/exit.o $(DEFDIR)/fc.o \
  	       $(DEFDIR)/fg_bg.o $(DEFDIR)/hash.o $(DEFDIR)/help.o \
  	       $(DEFDIR)/history.o $(DEFDIR)/jobs.o $(DEFDIR)/kill.o \
  	       $(DEFDIR)/let.o $(DEFDIR)/pushd.o $(DEFDIR)/read.o \
  	       $(DEFDIR)/return.o $(DEFDIR)/shopt.o $(DEFDIR)/printf.o \
! 	       $(DEFDIR)/sets.o $(DEFDIR)/setattr.o $(DEFDIR)/shift.o \
  	       $(DEFDIR)/source.o $(DEFDIR)/suspend.o $(DEFDIR)/test.o \
  	       $(DEFDIR)/times.o $(DEFDIR)/trap.o $(DEFDIR)/type.o \
  	       $(DEFDIR)/ulimit.o $(DEFDIR)/umask.o $(DEFDIR)/wait.o \
  	       $(DEFDIR)/getopts.o $(BUILTIN_C_OBJ)
+ 
  GETOPT_SOURCE   = $(DEFSRC)/getopt.c $(DEFSRC)/getopt.h
  PSIZE_SOURCE	= $(DEFSRC)/psize.sh $(DEFSRC)/psize.c
  
***************
*** 439,445 ****
  		  mksyntax${EXEEXT} syntax.c $(VERSPROG) $(VERSOBJ)
  CREATED_CONFIGURE = config.h config.cache config.status config.log \
  		    stamp-h
! CREATED_MAKEFILES = Makefile builtins/Makefile doc/Makefile \
  		    lib/readline/Makefile lib/glob/Makefile \
  		    lib/sh/Makefile lib/tilde/Makefile lib/malloc/Makefile \
  		    lib/termcap/Makefile examples/loadables/Makefile \
--- 483,491 ----
  		  mksyntax${EXEEXT} syntax.c $(VERSPROG) $(VERSOBJ)
  CREATED_CONFIGURE = config.h config.cache config.status config.log \
  		    stamp-h
! 
! CREATED_MAKEFILES = $(EXEC_SQL_DIR)/Makefile \
! 		    Makefile builtins/Makefile doc/Makefile \
  		    lib/readline/Makefile lib/glob/Makefile \
  		    lib/sh/Makefile lib/tilde/Makefile lib/malloc/Makefile \
  		    lib/termcap/Makefile examples/loadables/Makefile \
***************
*** 448,459 ****
  # Keep GNU Make from exporting the entire environment for small machines.
  .NOEXPORT:
  
! .made: $(Program) bashbug
  	@echo "$(Program) last made for a $(Machine) running $(OS)" >.made
  
! $(Program):  .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP)
  	$(RM) $@
! 	$(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
  	ls -l $(Program)
  	size $(Program)
  
--- 494,505 ----
  # Keep GNU Make from exporting the entire environment for small machines.
  .NOEXPORT:
  
! .made: $(Program) 
  	@echo "$(Program) last made for a $(Machine) running $(OS)" >.made
  
! $(Program):  .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP) $(POSTGRESQL_LIBS)
  	$(RM) $@
! 	$(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) $(POSTGRESQL_LIBS)
  	ls -l $(Program)
  	size $(Program)
  
***************
*** 466,478 ****
  	@echo "	  ***********************************************************"
  	@echo
  
! bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG)
! 	@sed -e "s%!MACHINE!%$(Machine)%" -e "s%!OS!%$(OS)%" \
! 	     -e "s%!CFLAGS!%$(CCFLAGS)%" -e "s%!CC!%$(CC)%" \
! 	     -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \
! 	     -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \
! 	     $(SUPPORT_SRC)bashbug.sh > $@
! 	@chmod a+rx bashbug
  
  strip:	$(Program) .made
  	strip $(Program)
--- 512,524 ----
  	@echo "	  ***********************************************************"
  	@echo
  
! #bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG)
! #	@sed -e "s%!MACHINE!%$(Machine)%" -e "s%!OS!%$(OS)%" \
! #	     -e "s%!CFLAGS!%$(CCFLAGS)%" -e "s%!CC!%$(CC)%" \
! #	     -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \
! #	     -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \
! #	     $(SUPPORT_SRC)bashbug.sh > $@
! #	@chmod a+rx bashbug
  
  strip:	$(Program) .made
  	strip $(Program)
***************
*** 559,567 ****
--- 605,619 ----
  	$(RM) $@
  	./mksyntax -o $@
  
+ $(EXEC_SQL_OFILES): $(EXEC_SQL_SRC) $(EXEC_SQL_H)
+ 	@(cd $(EXEC_SQL_DIR) && $(MAKE) $(MFLAGS) ) || exit 1
+ 
  $(BUILTINS_LIBRARY): $(BUILTIN_DEFS) $(BUILTIN_C_SRC) config.h ${BASHINCDIR}/memalloc.h
  	@(cd $(DEFDIR) && $(MAKE) $(MFLAGS) DEBUG=${DEBUG} libbuiltins.a ) || exit 1
  
+ $(DEFSRC)/exec_sql.def: $(EXEC_SQL_DIR)/exec_sql.def
+ 	cp $(EXEC_SQL_DIR)/exec_sql.def $(DEFSRC)/exec_sql.def
+ 
  # these require special rules to circumvent make builtin rules
  ${DEFDIR}/common.o:	$(BUILTIN_SRCDIR)/common.c
  	@(cd $(DEFDIR) && $(MAKE) $(MFLAGS) DEBUG=${DEBUG} common.o) || exit 1
***************
*** 592,603 ****
  	$(SHELL) ./config.status --recheck
  
  # comment out for distribution
! $(srcdir)/configure:	$(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
! 	cd $(srcdir) && autoconf
  
  # for chet
! reconfig: force
! 	sh $(srcdir)/configure
  
  #newversion:	mkversion
  #	$(RM) .build
--- 644,655 ----
  	$(SHELL) ./config.status --recheck
  
  # comment out for distribution
! #$(srcdir)/configure:	$(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
! #	cd $(srcdir) && autoconf
  
  # for chet
! #reconfig: force
! #	sh $(srcdir)/configure
  
  #newversion:	mkversion
  #	$(RM) .build
***************
*** 623,638 ****
  
  installdirs:
  	@${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(bindir)
! 	@${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(man1dir)
! 	@${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(infodir)
  
  install:	.made installdirs
  	$(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(DESTDIR)$(bindir)/$(Program)
! 	$(INSTALL_PROGRAM) $(INSTALLMODE2) bashbug $(DESTDIR)$(bindir)/bashbug
! 	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
! 		man1dir=$(man1dir) man1ext=$(man1ext) \
! 		man3dir=$(man3dir) man3ext=$(man3ext) \
! 		infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ )
  
  install-strip:
  	$(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
--- 675,690 ----
  
  installdirs:
  	@${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(bindir)
! #	@${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(man1dir)
! #	@${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(infodir)
  
  install:	.made installdirs
  	$(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(DESTDIR)$(bindir)/$(Program)
! 	$(INSTALL_PROGRAM) -m 644 $(PGBASHRC_DIR)/$(PGBASHRC) $(etcdir)/$(PGBASHRC)
! #	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
! #		man1dir=$(man1dir) man1ext=$(man1ext) \
! #		man3dir=$(man3dir) man3ext=$(man3ext) \
! #		infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ )
  
  install-strip:
  	$(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
***************
*** 640,654 ****
  		DESTDIR=$(DESTDIR) install
  
  uninstall:	.made
! 	$(RM) $(DESTDIR)$(bindir)/$(Program) $(DESTDIR)$(bindir)/bashbug
! 	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
! 		man1dir=$(man1dir) man1ext=$(man1ext) \
! 		man3dir=$(man3dir) man3ext=$(man3ext) \
! 		infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ )
  
  .PHONY: basic-clean clean realclean maintainer-clean distclean mostlyclean
  basic-clean:
! 	$(RM) $(OBJECTS) $(Program) bashbug
  	$(RM) .build .made version.h
  
  clean:	basic-clean
--- 692,706 ----
  		DESTDIR=$(DESTDIR) install
  
  uninstall:	.made
! 	$(RM) $(DESTDIR)$(bindir)/$(Program) 
! #	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
! #		man1dir=$(man1dir) man1ext=$(man1ext) \
! #		man3dir=$(man3dir) man3ext=$(man3ext) \
! #		infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ )
  
  .PHONY: basic-clean clean realclean maintainer-clean distclean mostlyclean
  basic-clean:
! 	$(RM) $(OBJECTS) $(Program) 
  	$(RM) .build .made version.h
  
  clean:	basic-clean
***************
*** 1085,1093 ****
  builtins/command.o: quit.h $(DEFSRC)/bashgetopt.h
  builtins/command.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h 
  builtins/command.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/declare.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h xmalloc.h ${BASHINCDIR}/maxpath.h
! builtins/declare.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h quit.h
! builtins/declare.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/echo.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h xmalloc.h ${BASHINCDIR}/maxpath.h
  builtins/echo.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h quit.h
  builtins/echo.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
--- 1137,1145 ----
  builtins/command.o: quit.h $(DEFSRC)/bashgetopt.h
  builtins/command.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h 
  builtins/command.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/declares.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h xmalloc.h ${BASHINCDIR}/maxpath.h
! builtins/declares.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h quit.h
! builtins/declares.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/echo.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h xmalloc.h ${BASHINCDIR}/maxpath.h
  builtins/echo.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h quit.h
  builtins/echo.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
***************
*** 1162,1170 ****
  builtins/return.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h xmalloc.h ${BASHINCDIR}/maxpath.h
  builtins/return.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/return.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h 
! builtins/set.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h xmalloc.h ${BASHINCDIR}/maxpath.h
! builtins/set.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/set.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h flags.h
  builtins/setattr.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h xmalloc.h ${BASHINCDIR}/maxpath.h
  builtins/setattr.o: quit.h $(DEFSRC)/common.h $(DEFSRC)/bashgetopt.h
  builtins/setattr.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h 
--- 1214,1222 ----
  builtins/return.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h xmalloc.h ${BASHINCDIR}/maxpath.h
  builtins/return.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/return.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h 
! builtins/sets.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h xmalloc.h ${BASHINCDIR}/maxpath.h
! builtins/sets.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/sets.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h flags.h
  builtins/setattr.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h xmalloc.h ${BASHINCDIR}/maxpath.h
  builtins/setattr.o: quit.h $(DEFSRC)/common.h $(DEFSRC)/bashgetopt.h
  builtins/setattr.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h arrayfunc.h conftypes.h 
***************
*** 1237,1243 ****
  builtins/colon.o: $(DEFSRC)/colon.def
  builtins/command.o: $(DEFSRC)/command.def
  builtins/complete.o: $(DEFSRC)/complete.def
! builtins/declare.o: $(DEFSRC)/declare.def
  builtins/echo.o: $(DEFSRC)/echo.def
  builtins/enable.o: $(DEFSRC)/enable.def
  builtins/eval.o: $(DEFSRC)/eval.def
--- 1289,1295 ----
  builtins/colon.o: $(DEFSRC)/colon.def
  builtins/command.o: $(DEFSRC)/command.def
  builtins/complete.o: $(DEFSRC)/complete.def
! builtins/declares.o: $(DEFSRC)/declare.def
  builtins/echo.o: $(DEFSRC)/echo.def
  builtins/enable.o: $(DEFSRC)/enable.def
  builtins/eval.o: $(DEFSRC)/eval.def
***************
*** 1257,1263 ****
  builtins/read.o: $(DEFSRC)/read.def
  builtins/reserved.o: $(DEFSRC)/reserved.def
  builtins/return.o: $(DEFSRC)/return.def
! builtins/set.o: $(DEFSRC)/set.def
  builtins/setattr.o: $(DEFSRC)/setattr.def
  builtins/shift.o: $(DEFSRC)/shift.def
  builtins/shopt.o: $(DEFSRC)/shopt.def
--- 1309,1315 ----
  builtins/read.o: $(DEFSRC)/read.def
  builtins/reserved.o: $(DEFSRC)/reserved.def
  builtins/return.o: $(DEFSRC)/return.def
! builtins/sets.o: $(DEFSRC)/set.def
  builtins/setattr.o: $(DEFSRC)/setattr.def
  builtins/shift.o: $(DEFSRC)/shift.def
  builtins/shopt.o: $(DEFSRC)/shopt.def