diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | Makerules | 10 | ||||
| -rw-r--r-- | config.make.in | 1 | ||||
| -rwxr-xr-x | configure | 63 | ||||
| -rw-r--r-- | configure.in | 34 | ||||
| -rw-r--r-- | mach/Makefile | 4 |
6 files changed, 76 insertions, 52 deletions
diff --git a/ChangeLog b/ChangeLog index ab9952ad03..2e42e869e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ Wed May 8 12:08:35 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> + * Makerules (install-lib.so rules): Undouble $s in target and dep + parts of o-iterator-doit defns. + (unversioned libraries install rule): Fix pattern. + + * mach/Makefile (mach-src-headers): Use $(base-machine) instead of + $(config-machine). + ($(includedir)/machine): Likewise. + + * config.make.in (base-machine): New variable. + * configure.in (machine): Move case stmt to set $machine out of sysdep + dirs AC_CACHE_CHECK. + (base_machine): New variable, set in that switch and AC_SUBST'd. + + * Makerules (stub-$(subdir)): Use file name in directory as output, + since cmd is cd'd. + * configure.in (MSGFMT): Use : if none found. * po/Makefile: Include ../Rules instead of ../Makerules. diff --git a/Makerules b/Makerules index 47e5fb8b0f..d206a6edca 100644 --- a/Makerules +++ b/Makerules @@ -558,7 +558,7 @@ versioned := $(foreach so,$(install-lib.so),\ # Install all the unversioned shared libraries. $(addprefix $(libdir)/,$(filter-out $(versioned),$(install-lib.so))): \ -$(libdir)/%: $(objpfx)lib%.so; $(do-install-program) +$(libdir)/%.so: $(objpfx)%.so; $(do-install-program) make-link = cd $(@D); rm -f $(@F); $(LN_S) $(<F) $(@F) @@ -581,19 +581,19 @@ ifneq (,$(versioned)) # Produce three sets of rules as above for all the smaller versioned libraries. define o-iterator-doit -$$(libdir)/$o: $$(libdir)/$o$$($o-version); $$(make-link) +$(libdir)/$o: $(libdir)/$o$($o-version); $$(make-link) endef object-suffixes-left := $(versioned) include $(..)o-iterator.mk define o-iterator-doit -$$(libdir)/$o$$($o-version): $$(libdir)/$(o:.so=)-$$(version).so; $$(make-link) +$(libdir)/$o$($o-version): $(libdir)/$(o:.so=)-$(version).so; $$(make-link) endef object-suffixes-left := $(versioned) include $(..)o-iterator.mk define o-iterator-doit -$$(libdir)/$(o:.so=)-$$(version).so: $$(objpfx)$o; $$(do-install-program) +$(libdir)/$(o:.so=)-$(version).so: $(objpfx)$o; $$(do-install-program) endef object-suffixes-left := $(versioned) include $(..)o-iterator.mk @@ -744,7 +744,7 @@ $(common-objpfx)stub-$(subdir): $(+depfiles) sed -n 's/^stub_warning *(\([^)]*\).*$$/#define __stub_\1/p' \ `sed -n 's@^.*$s/\([a-z0-9_-]*\.c\).*$$@'"$$s"/'\1@p' \ $(patsubst $(objpfx)%,%,$^) /dev/null` \ - /dev/null > $@T + /dev/null > $(@F)T mv -f $@T $@ # Make the distribution tar file. diff --git a/config.make.in b/config.make.in index dd18fee234..644e5edde5 100644 --- a/config.make.in +++ b/config.make.in @@ -8,6 +8,7 @@ exec_prefix = @exec_prefix@ # System configuration. config-machine = @host_cpu@ +base-machine = @base_machine@ config-vendor = @host_vendor@ config-os = @host_os@ config-sysdirs = @sysnames@ diff --git a/configure b/configure index 4b82e80f3b..b00ab8a37e 100755 --- a/configure +++ b/configure @@ -725,34 +725,35 @@ alpha*-linux*) gnu_ld=no elf=no ;; esac -# Compute the list of sysdep directories for this configuration. -sysdep_dir=$srcdir/sysdeps -echo $ac_n "checking sysdep dirs""... $ac_c" 1>&4 -if eval "test \"`echo '$''{'libc_cv_sysdirs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&4 -else - machine=$config_machine +machine=$config_machine vendor=$config_vendor os=$config_os # Expand the configuration machine name into a subdirectory by architecture # type and particular chip. case "$machine" in -a29k | am29000) machine=a29k ;; -alpha*) machine=alpha/$machine ;; -hppa*) machine=hppa/$machine ;; -i[345]86) machine=i386/$machine ;; -m680?0) machine=m68k/$machine ;; -m68k) machine=m68k/m68020 ;; -m88???) machine=m88k/$machine ;; -m88k) machine=m88k/m88100 ;; -mips*) machine=mips/$machine ;; -mips64*) machine=mips/mips64/$machine ;; -sparc[6789]) machine=sparc/$machine ;; -supersparc) machine=sparc/sparc8 ;; +a29k | am29000) base_machine=a29k machine=a29k ;; +alpha*) base_machine=alpha machine=alpha/$machine ;; +hppa*) base_machine=hppa machine=hppa/$machine ;; +i[345]86) base_machine=i386 machine=i386/$machine ;; +m680?0) base_machine=m68k machine=m68k/$machine ;; +m68k) base_machine=m68k machine=m68k/m68020 ;; +m88???) base_machine=m88k machine=m88k/$machine ;; +m88k) base_machine=m88k machine=m88k/m88100 ;; +mips*) base_machine=mips machine=mips/$machine ;; +mips64*) base_machine=mips64 machine=mips/mips64/$machine ;; +sparc[6789]) base_machine=sparc machine=sparc/$machine ;; +supersparc) base_machine=sparc machine=sparc/sparc8 ;; esac -# Make sco3.2v4 become sco3.2.4 and sunos4.1.1_U1 become sunos4.1.1.U1. + +# Compute the list of sysdep directories for this configuration. +sysdep_dir=$srcdir/sysdeps +echo $ac_n "checking sysdep dirs""... $ac_c" 1>&4 +if eval "test \"`echo '$''{'libc_cv_sysdirs'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&4 +else + # Make sco3.2v4 become sco3.2.4 and sunos4.1.1_U1 become sunos4.1.1.U1. os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`" case "$os" in @@ -1032,6 +1033,7 @@ fi test -n "$MSGFMT" && break done +test -n "$MSGFMT" || MSGFMT=":" echo $ac_n "checking build system type""... $ac_c" 1>&4 @@ -1195,13 +1197,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1199 "configure" +#line 1201 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1210,13 +1212,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1214 "configure" +#line 1216 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1265,7 +1267,7 @@ if eval "test \"`echo '$''{'libc_cv_friendly_stddef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1269 "configure" +#line 1271 "configure" #include "confdefs.h" #define __need_size_t #define __need_wchar_t @@ -1281,7 +1283,7 @@ size_t size; wchar_t wchar; if (&size == NULL || &wchar == NULL) abort (); ; return 0; } EOF -if { (eval echo configure:1285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_friendly_stddef=yes else @@ -1388,7 +1390,7 @@ if eval "test \"`echo '$''{'libc_cv_have_initfini'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1392 "configure" +#line 1394 "configure" #include "confdefs.h" int main() { return 0; } @@ -1397,7 +1399,7 @@ asm (".section .init"); asm (".section .fini"); ; return 0; } EOF -if { (eval echo configure:1401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_have_initfini=yes else @@ -1425,7 +1427,7 @@ if eval "test \"`echo '$''{'libc_cv_asm_underscores'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext <<EOF -#line 1429 "configure" +#line 1431 "configure" #include "confdefs.h" asm ("_glibc_foobar:"); int main() { return 0; } @@ -1433,7 +1435,7 @@ int t() { glibc_foobar (); ; return 0; } EOF -if { (eval echo configure:1437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* libc_cv_asm_underscores=yes else @@ -1781,6 +1783,7 @@ s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g s%@host_vendor@%$host_vendor%g s%@host_os@%$host_os%g +s%@base_machine@%$base_machine%g s%@sysnames@%$sysnames%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g diff --git a/configure.in b/configure.in index d8700e6d83..ed288db410 100644 --- a/configure.in +++ b/configure.in @@ -95,9 +95,6 @@ alpha*-linux*) gnu_ld=no elf=no ;; esac -# Compute the list of sysdep directories for this configuration. -sysdep_dir=$srcdir/sysdeps -AC_CACHE_CHECK(sysdep dirs, libc_cv_sysdirs, [dnl machine=$config_machine vendor=$config_vendor os=$config_os @@ -107,20 +104,27 @@ changequote(,)dnl # Expand the configuration machine name into a subdirectory by architecture # type and particular chip. case "$machine" in -a29k | am29000) machine=a29k ;; -alpha*) machine=alpha/$machine ;; -hppa*) machine=hppa/$machine ;; -i[345]86) machine=i386/$machine ;; -m680?0) machine=m68k/$machine ;; -m68k) machine=m68k/m68020 ;; -m88???) machine=m88k/$machine ;; -m88k) machine=m88k/m88100 ;; -mips*) machine=mips/$machine ;; -mips64*) machine=mips/mips64/$machine ;; -sparc[6789]) machine=sparc/$machine ;; -supersparc) machine=sparc/sparc8 ;; +a29k | am29000) base_machine=a29k machine=a29k ;; +alpha*) base_machine=alpha machine=alpha/$machine ;; +hppa*) base_machine=hppa machine=hppa/$machine ;; +i[345]86) base_machine=i386 machine=i386/$machine ;; +m680?0) base_machine=m68k machine=m68k/$machine ;; +m68k) base_machine=m68k machine=m68k/m68020 ;; +m88???) base_machine=m88k machine=m88k/$machine ;; +m88k) base_machine=m88k machine=m88k/m88100 ;; +mips*) base_machine=mips machine=mips/$machine ;; +mips64*) base_machine=mips64 machine=mips/mips64/$machine ;; +sparc[6789]) base_machine=sparc machine=sparc/$machine ;; +supersparc) base_machine=sparc machine=sparc/sparc8 ;; esac +changequote([,])dnl +AC_SUBST(base_machine) +# Compute the list of sysdep directories for this configuration. +sysdep_dir=$srcdir/sysdeps +AC_CACHE_CHECK(sysdep dirs, libc_cv_sysdirs, [dnl +dnl We need to use [ and ] for other purposes for a while now. +changequote(,)dnl # Make sco3.2v4 become sco3.2.4 and sunos4.1.1_U1 become sunos4.1.1.U1. os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`" diff --git a/mach/Makefile b/mach/Makefile index b48cabfeb2..747a6bfead 100644 --- a/mach/Makefile +++ b/mach/Makefile @@ -68,7 +68,7 @@ vpath %.defs $(mach-srcdir) # Install all .h and .defs files we find in some of the kernel's source # directories and their subdirectories (in MK82, max one level deep). mach-src-headers := $(wildcard $(foreach dir,mach device mach_debug \ - $(config-machine),\ + $(base-machine),\ $(addprefix $(mach-srcdir)/$(dir)/,\ *.defs *.h \ */*.defs */*.h))) @@ -91,7 +91,7 @@ $(includedir)/%: $(mach-srcdir)/%; $(do-install) install-others += $(includedir)/mach/machine $(includedir)/machine $(includedir)/mach/machine $(includedir)/machine: $(common-objpfx)config.make -rm -f $@ - cd $(@D); ln -s $(config-machine) $(@F) + cd $(@D); ln -s $(base-machine) $(@F) # Install Mach's <sys/version.h> as <mach/version.h>. install-others += $(includedir)/mach/version.h |