comparison configure @ 4939:349f01075eb7

build fixes for gdbinit and config-dependent elc files -------------------- ChangeLog entries follow: -------------------- ChangeLog addition: 2010-01-20 Ben Wing <ben@xemacs.org> * Makefile.in.in: * Makefile.in.in (GENERATED_HEADERS): * Makefile.in.in (.PHONY): * Makefile.in.in (src/.gdbinit): * configure: * configure.ac (TAB): etc/gdbinit.in has been moved to src/.gdbinit.in.in. Reflect this -- generate src/.gdbinit.in from src/.gdbinit.in.in, and use the normal mechanism for doing so instead of copying it specially. Add target for `config-changed' and pass down to `src'. Move some PHONY declarations to just before the actual targets. src/ChangeLog addition: 2010-01-20 Ben Wing <ben@xemacs.org> * .gdbinit.in.in: Moved here from etc/.gdbinit.in. Put @srcdir@ in various places rather than just `..' whenever Makefile.in.in does so. Fixes various strange crashes and errors than occur when using `..'. * Makefile.in.in (config-changed): Add target, useful when building both Unicode-internal and old-Mule workspaces using --srcdir and don't run configure before switching from one to the other.
author Ben Wing <ben@xemacs.org>
date Wed, 20 Jan 2010 19:48:26 -0600
parents 8b63e21b0436
children aacafdd2bc67
comparison
equal deleted inserted replaced
4938:299dce99bdad 4939:349f01075eb7
20327 if test "$with_modules" = "no"; then 20327 if test "$with_modules" = "no"; then
20328 MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi 20328 MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi
20329 fi 20329 fi
20330 20330
20331 20331
20332 internal_makefile_list="Makefile.in" 20332 internal_makefile_list="Makefile.in src/.gdbinit.in"
20333 SUBDIR_MAKEFILES='' 20333 SUBDIR_MAKEFILES=''
20334 test -d lock || mkdir lock 20334 test -d lock || mkdir lock
20335 for dir in $MAKE_SUBDIR; do 20335 for dir in $MAKE_SUBDIR; do
20336 case "$dir" in */* ) ( for d in `echo $dir | sed 's:/: :g'` ; do 20336 case "$dir" in */* ) ( for d in `echo $dir | sed 's:/: :g'` ; do
20337 test -d "$d" || mkdir "$d"; cd "$d" 20337 test -d "$d" || mkdir "$d"; cd "$d"
20374 for var in extra_objs c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all; do eval "echo \"$var = '\$$var'\""; done 20374 for var in extra_objs c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all; do eval "echo \"$var = '\$$var'\""; done
20375 echo "" 20375 echo ""
20376 fi 20376 fi
20377 20377
20378 20378
20379 if test -f "$srcdir/etc/gdbinit.in"; then 20379 if test -f "$srcdir/etc/gdbinit.in.in"; then
20380 test "$verbose" = "yes" && echo "creating src/.gdbinit.in" 20380 test "$verbose" = "yes" && echo "creating src/.gdbinit.in.in"
20381 cp $srcdir/etc/gdbinit.in src/.gdbinit.in 20381 cp $srcdir/etc/gdbinit.in.in src/.gdbinit.in.in
20382 fi 20382 fi
20383 20383
20384 if test -f "$srcdir/etc/dbxrc.in"; then 20384 if test -f "$srcdir/etc/dbxrc.in"; then
20385 test "$verbose" = "yes" && echo "creating src/.dbxrc.in" 20385 test "$verbose" = "yes" && echo "creating src/.dbxrc.in"
20386 echo ". $srcdir/etc/dbxrc.in" > "src/.dbxrc.in" 20386 echo ". $srcdir/etc/dbxrc.in" > "src/.dbxrc.in"