small changes to accomodate other versions of configure
This commit is contained in:
parent
25113b4647
commit
079399f6df
|
@ -1,8 +1,12 @@
|
||||||
Fri Dec 27 16:26:47 1991 K. Richard Pixley (rich at cygnus.com)
|
Fri Dec 27 16:26:47 1991 K. Richard Pixley (rich at cygnus.com)
|
||||||
|
|
||||||
* configure.in, Makefile.in: fix clean-info, add flex.
|
* configure.in, Makefile.in: fix clean-info, add flex. add
|
||||||
|
fileutils.
|
||||||
|
|
||||||
* configure: be less sensitive to spaces in Makefile.in.
|
* configure: be less sensitive to spaces in Makefile.in. Do not
|
||||||
|
look for sources in "..". Doing so breaks subdirectories that
|
||||||
|
might have their own configure. If a subdir has it's own
|
||||||
|
configure script, use it.
|
||||||
|
|
||||||
Thu Dec 26 16:30:26 1991 K. Richard Pixley (rich at cygnus.com)
|
Thu Dec 26 16:30:26 1991 K. Richard Pixley (rich at cygnus.com)
|
||||||
|
|
||||||
|
|
72
Makefile.in
72
Makefile.in
|
@ -98,7 +98,7 @@ install-dir.info:
|
||||||
|
|
||||||
# clib prms
|
# clib prms
|
||||||
all.normal: all-texinfo all-bison all-byacc all-flex all-ld all-gnulib \
|
all.normal: all-texinfo all-bison all-byacc all-flex all-ld all-gnulib \
|
||||||
all-gdb all-make all-cvs all-emacs all-ispell
|
all-gdb all-make all-cvs all-emacs all-ispell all-fileutils
|
||||||
all.cross: all-bison all-ld all-gnulib all-gdb
|
all.cross: all-bison all-ld all-gnulib all-gdb
|
||||||
# $(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS) $(OTHERS)"
|
# $(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS) $(OTHERS)"
|
||||||
|
|
||||||
|
@ -106,7 +106,7 @@ clean: clean-libiberty clean-texinfo clean-bfd clean-binutils \
|
||||||
clean-bison clean-byacc clean-flex clean-ld clean-gas \
|
clean-bison clean-byacc clean-flex clean-ld clean-gas \
|
||||||
clean-gcc clean-gnulib clean-readline clean-glob clean-gdb \
|
clean-gcc clean-gnulib clean-readline clean-glob clean-gdb \
|
||||||
clean-make clean-diff clean-grep clean-rcs clean-gdbm \
|
clean-make clean-diff clean-grep clean-rcs clean-gdbm \
|
||||||
clean-cvs clean-emacs clean-ispell
|
clean-cvs clean-emacs clean-ispell clean-fileutils
|
||||||
rm -rf *.a TEMP errs core *.o *~ \#* TAGS *.E
|
rm -rf *.a TEMP errs core *.o *~ \#* TAGS *.E
|
||||||
|
|
||||||
install: $(INSTALL_TARGET)
|
install: $(INSTALL_TARGET)
|
||||||
|
@ -116,7 +116,7 @@ install.all: install-dirs install-libiberty install-texinfo \
|
||||||
install-binutils install-bison install-byacc install-flex \
|
install-binutils install-bison install-byacc install-flex \
|
||||||
install-ld install-gas install-gcc install-gnulib \
|
install-ld install-gas install-gcc install-gnulib \
|
||||||
install-readline install-glob install-gdb install-make \
|
install-readline install-glob install-gdb install-make \
|
||||||
install-cvs install-emacs install-ispell
|
install-cvs install-emacs install-ispell install-fileutils
|
||||||
install.cross: install-dirs install-libiberty install-binutils install-bison \
|
install.cross: install-dirs install-libiberty install-binutils install-bison \
|
||||||
install-byacc install-ld install-gas install-gnulib \
|
install-byacc install-ld install-gas install-gnulib \
|
||||||
install-readline install-glob install-gdb
|
install-readline install-glob install-gdb
|
||||||
|
@ -1414,6 +1414,72 @@ install-flex: force
|
||||||
true ; \
|
true ; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
### fileutils
|
||||||
|
.PHONY: all-fileutils just-fileutils
|
||||||
|
all-fileutils: just-fileutils
|
||||||
|
just-fileutils: force
|
||||||
|
if [ -d $(unsubdir)/fileutils ] ; then \
|
||||||
|
(cd $(unsubdir)/fileutils$(subdir); \
|
||||||
|
$(MAKE) \
|
||||||
|
"prefix=$(prefix)" \
|
||||||
|
"datadir=$(datadir)" \
|
||||||
|
"mandir=$(mandir)" \
|
||||||
|
"against=$(against)" \
|
||||||
|
"AR=$(AR)" \
|
||||||
|
"AR_FLAGS=$(AR_FLAGS)" \
|
||||||
|
"CC=$(CC)" \
|
||||||
|
"RANLIB=$(RANLIB)" \
|
||||||
|
"LOADLIBES=$(LOADLIBES)" \
|
||||||
|
"LDFLAGS=$(LDFLAGS)" \
|
||||||
|
"BISON=$(BISON)" \
|
||||||
|
"MAKEINFO=$(MAKEINFO)" \
|
||||||
|
all) ; \
|
||||||
|
else \
|
||||||
|
true ; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
clean-fileutils: force
|
||||||
|
if [ -d $(unsubdir)/fileutils ] ; then \
|
||||||
|
(cd $(unsubdir)/fileutils$(subdir); \
|
||||||
|
$(MAKE) \
|
||||||
|
"prefix=$(prefix)" \
|
||||||
|
"datadir=$(datadir)" \
|
||||||
|
"mandir=$(mandir)" \
|
||||||
|
"against=$(against)" \
|
||||||
|
"AR=$(AR)" \
|
||||||
|
"AR_FLAGS=$(AR_FLAGS)" \
|
||||||
|
"CC=$(CC)" \
|
||||||
|
"RANLIB=$(RANLIB)" \
|
||||||
|
"LOADLIBES=$(LOADLIBES)" \
|
||||||
|
"LDFLAGS=$(LDFLAGS)" \
|
||||||
|
"BISON=$(BISON)" \
|
||||||
|
"MAKEINFO=$(MAKEINFO)" \
|
||||||
|
clean) ; \
|
||||||
|
else \
|
||||||
|
true ; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
install-fileutils: force
|
||||||
|
if [ -d $(unsubdir)/fileutils ] ; then \
|
||||||
|
(cd $(unsubdir)/fileutils$(subdir); \
|
||||||
|
$(MAKE) \
|
||||||
|
"prefix=$(prefix)" \
|
||||||
|
"datadir=$(datadir)" \
|
||||||
|
"mandir=$(mandir)" \
|
||||||
|
"against=$(against)" \
|
||||||
|
"AR=$(AR)" \
|
||||||
|
"AR_FLAGS=$(AR_FLAGS)" \
|
||||||
|
"CC=$(CC)" \
|
||||||
|
"RANLIB=$(RANLIB)" \
|
||||||
|
"LOADLIBES=$(LOADLIBES)" \
|
||||||
|
"LDFLAGS=$(LDFLAGS)" \
|
||||||
|
"BISON=$(BISON)" \
|
||||||
|
"MAKEINFO=$(MAKEINFO)" \
|
||||||
|
install) ; \
|
||||||
|
else \
|
||||||
|
true ; \
|
||||||
|
fi
|
||||||
|
|
||||||
### other supporting targets
|
### other supporting targets
|
||||||
# this is a bad hack.
|
# this is a bad hack.
|
||||||
all.xclib: all.normal
|
all.xclib: all.normal
|
||||||
|
|
|
@ -360,8 +360,6 @@ fi
|
||||||
if [ -z "${srcdir}" ] ; then
|
if [ -z "${srcdir}" ] ; then
|
||||||
if [ -r configure.in ] ; then
|
if [ -r configure.in ] ; then
|
||||||
srcdir=.
|
srcdir=.
|
||||||
elif [ -r ../configure.in ] ; then
|
|
||||||
srcdir=..
|
|
||||||
else
|
else
|
||||||
echo '***' "Can't find configure.in. Try using -srcdir=some_dir"
|
echo '***' "Can't find configure.in. Try using -srcdir=some_dir"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -755,7 +753,13 @@ ${progname}" ${arguments} "
|
||||||
esac
|
esac
|
||||||
|
|
||||||
### The recursion line is here.
|
### The recursion line is here.
|
||||||
if (${progname} -recurring ${host_alias} -target=${target_alias} \
|
if [ -x configure ] ; then
|
||||||
|
recprog=`pwd`/configure
|
||||||
|
else
|
||||||
|
recprog=${progname}
|
||||||
|
fi
|
||||||
|
|
||||||
|
if (${recprog} -recurring ${host_alias} -target=${target_alias} \
|
||||||
${verbose} ${subdirs} ${removing} ${prefixoption} \
|
${verbose} ${subdirs} ${removing} ${prefixoption} \
|
||||||
${tmpdiroption} ${namesubdiroption} ${datadiroption} \
|
${tmpdiroption} ${namesubdiroption} ${datadiroption} \
|
||||||
${srcdiroption}) ; then
|
${srcdiroption}) ; then
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
# script appropriate for this directory. For more information, check
|
# script appropriate for this directory. For more information, check
|
||||||
# any existing configure script.
|
# any existing configure script.
|
||||||
|
|
||||||
configdirs="libiberty texinfo bfd binutils byacc bison gcc readline glob flex ld gas gnulib clib gdb emacs ispell make grep diff rcs gdbm cvs prms"
|
configdirs="libiberty texinfo bfd binutils byacc bison gcc readline glob flex ld gas gnulib clib gdb emacs ispell make grep diff rcs gdbm cvs prms fileutils"
|
||||||
srctrigger=README
|
srctrigger=cfg-paper.texi
|
||||||
srcname="gnu development package"
|
srcname="gnu development package"
|
||||||
|
|
||||||
# per-host:
|
# per-host:
|
||||||
|
|
Loading…
Reference in New Issue