diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makeconfig | 35 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.in | 8 |
4 files changed, 15 insertions, 49 deletions
diff --git a/ChangeLog b/ChangeLog index 8ff8a77c9d..d942bb035c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2012-10-19 Joseph Myers <joseph@codesourcery.com> + * Makeconfig (ARCH): Remove all definitions. + (machine): Likewise. + [ARCH]: Remove conditional code. + [!objdir]: Give error. + [!objdir] (objpfx): Remove. + [!objdir] (common-objpfx): Likewise. + [!objdir] (common-objdir): Likewise. + * configure.in (config_makefile): Remove. Hardcode Makefile in + AC_CONFIG_FILES call. + * configure: Regenerated. + [BZ #13888] * io/ftwtest-sh (tmp): Set to use the working directory, not /tmp or TMPDIR. diff --git a/Makeconfig b/Makeconfig index f451ec22b4..9dadc3f177 100644 --- a/Makeconfig +++ b/Makeconfig @@ -33,31 +33,6 @@ ifdef subdir .. := ../ endif -# If config.make exists, the source directory was configured, -# so don't try to be clever and find another directory to build in. -ifneq (,$(wildcard $(..)config.make)) -ARCH = -machine = -else # Not configured. -ifndef ARCH -ifdef machine -ARCH = $(machine) -endif # machine -endif # ARCH -endif # config.make - -# Directory for object files and libc.a. If this is not defined, the -# object files live in the subdirectories where their sources live, and -# libc.a lives in the parent directory (this probably doesn't work any -# more). -ifdef ARCH -ifeq ($(filter /%,$(ARCH)),) -objdir := $(..)$(ARCH) -else -objdir = $(ARCH) -endif -endif - # $(common-objdir) is the place to put objects and # such that are not specific to a single subdir. ifdef objdir @@ -65,15 +40,7 @@ objpfx := $(patsubst %//,%/,$(objdir)/$(subdir)/) common-objpfx = $(objdir)/ common-objdir = $(objdir) else -objpfx := -ifdef .. -common-objpfx = $(..) -common-objdir = .. -else -# This is a kludge. make wizards might grok. -common-objpfx = sysdeps/../ -common-objdir = . -endif +objdir must be defined by the build-directory Makefile. endif # Root of the sysdeps tree. diff --git a/configure b/configure index 74ff690cf9..ed5df88829 100755 --- a/configure +++ b/configure @@ -7529,18 +7529,12 @@ $as_echo "$libc_cv_pic_default" >&6; } -if test "`(cd $srcdir; pwd)`" = "`pwd`"; then - config_makefile= -else - config_makefile=Makefile -fi - VERSION=`sed -n -e 's/^#define VERSION "\([^"]*\)"/\1/p' < $srcdir/version.h` RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h` -ac_config_files="$ac_config_files config.make ${config_makefile}" +ac_config_files="$ac_config_files config.make Makefile" ac_config_commands="$ac_config_commands default" @@ -8259,7 +8253,7 @@ do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "config.make") CONFIG_FILES="$CONFIG_FILES config.make" ;; - "${config_makefile}") CONFIG_FILES="$CONFIG_FILES ${config_makefile}" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/configure.in b/configure.in index facde5e55a..3af030a856 100644 --- a/configure.in +++ b/configure.in @@ -2185,18 +2185,12 @@ AC_SUBST(DEFINES) dnl See sysdeps/mach/configure.in for this variable. AC_SUBST(mach_interface_list) -if test "`(cd $srcdir; pwd)`" = "`pwd`"; then - config_makefile= -else - config_makefile=Makefile -fi - VERSION=`sed -n -e 's/^#define VERSION "\([^"]*\)"/\1/p' < $srcdir/version.h` RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h` AC_SUBST(VERSION) AC_SUBST(RELEASE) -AC_CONFIG_FILES([config.make ${config_makefile}]) +AC_CONFIG_FILES([config.make Makefile]) AC_CONFIG_COMMANDS([default],[[ case $CONFIG_FILES in *config.make*) echo "$config_vars" >> config.make;; |