* configure.in: Define CC_FOR_BUILD. Don't call AC_PROG_INSTALL.
* configure: Rebuild. * Makefile.in (INSTALL): Revert to using install.sh. (INSTALL_PROGRAM, INSTALL_DATA): Set to $(INSTALL). (INSTALL_XFORM, INSTALL_XFORM1): Restore. (CC_FOR_BUILD): Restore. (gencode): Build using $(CC_FOR_BUILD). (install): Don't install in $(tooldir).
This commit is contained in:
parent
c64dfabd07
commit
21852576ff
3 changed files with 28 additions and 11 deletions
|
@ -1,3 +1,14 @@
|
|||
Fri Sep 8 14:18:13 1995 Ian Lance Taylor <ian@cygnus.com>
|
||||
|
||||
* configure.in: Define CC_FOR_BUILD. Don't call AC_PROG_INSTALL.
|
||||
* configure: Rebuild.
|
||||
* Makefile.in (INSTALL): Revert to using install.sh.
|
||||
(INSTALL_PROGRAM, INSTALL_DATA): Set to $(INSTALL).
|
||||
(INSTALL_XFORM, INSTALL_XFORM1): Restore.
|
||||
(CC_FOR_BUILD): Restore.
|
||||
(gencode): Build using $(CC_FOR_BUILD).
|
||||
(install): Don't install in $(tooldir).
|
||||
|
||||
Thu Sep 7 15:02:31 1995 J.T. Conklin <jtc@rtl.cygnus.com>
|
||||
|
||||
(Try to) Update to new bfd autoconf scheme.
|
||||
|
|
|
@ -48,9 +48,11 @@ docdir = $(datadir)/doc
|
|||
|
||||
SHELL = /bin/sh
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL = $(srcroot)/install.sh -c
|
||||
INSTALL_PROGRAM = $(INSTALL)
|
||||
INSTALL_DATA = $(INSTALL)
|
||||
INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
|
||||
INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
|
||||
|
||||
AR = @AR@
|
||||
AR_FLAGS = rc
|
||||
|
@ -59,6 +61,7 @@ CFLAGS = @CFLAGS@
|
|||
BISON = bison
|
||||
MAKEINFO = makeinfo
|
||||
RANLIB = @RANLIB@
|
||||
CC_FOR_BUILD = @CC_FOR_BUILD@
|
||||
|
||||
HDEFINES = @HDEFINES@
|
||||
TDEFINES =
|
||||
|
@ -97,7 +100,7 @@ table.c:gencode
|
|||
# indent table.c
|
||||
|
||||
gencode:gencode.c
|
||||
$(CC) -o gencode $(srcdir)/gencode.c
|
||||
$(CC_FOR_BUILD) -o gencode $(srcdir)/gencode.c
|
||||
|
||||
.c.o:
|
||||
$(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $<
|
||||
|
@ -127,12 +130,7 @@ force:
|
|||
|
||||
# Copy the files into directories where they will be run.
|
||||
install:
|
||||
srcroot=`cd $(srcroot); pwd`; export srcroot; \
|
||||
n=`t='$(program_transform_name)'; echo run | sed -e "" $$t`; \
|
||||
$(INSTALL_PROGRAM) run $(bindir)/$$n ; \
|
||||
rm -f $(tooldir)/bin/run; \
|
||||
ln $(bindir)/$$n $(tooldir)/bin/run \
|
||||
|| (INSTALL_PROGRAM) run $(tooldir)/bin/run; \
|
||||
$(INSTALL_XFORM) run $(bindir)/run
|
||||
|
||||
install-man: run.1
|
||||
$(INSTALL_XFORM1) $(srcdir)/run.1 $(man1dir)/run.1
|
||||
|
|
|
@ -14,6 +14,14 @@ AC_SUBST(HDEFINES)
|
|||
AR=${AR-ar}
|
||||
AC_SUBST(AR)
|
||||
AC_PROG_RANLIB
|
||||
AC_PROG_INSTALL
|
||||
|
||||
# Put a plausible default for CC_FOR_BUILD in Makefile.
|
||||
AC_C_CROSS
|
||||
if test "x$cross_compiling" = "xno"; then
|
||||
CC_FOR_BUILD='$(CC)'
|
||||
else
|
||||
CC_FOR_BUILD=gcc
|
||||
fi
|
||||
AC_SUBST(CC_FOR_BUILD)
|
||||
|
||||
AC_OUTPUT(Makefile)
|
||||
|
|
Loading…
Reference in a new issue