use install-bin and install-sh in fixinc's makefile
From-SVN: r33423
This commit is contained in:
parent
932207025a
commit
7d7f30cfa0
|
@ -1,3 +1,10 @@
|
||||||
|
2000-04-25 Bruce Korb <bkorb@gnu.org>
|
||||||
|
|
||||||
|
* fixinc/Makefile.in: make the removal of old programs more
|
||||||
|
robust
|
||||||
|
* fixinc/mkfixinc.sh: use the two new targets in the Makefile:
|
||||||
|
install-bin and install-sh
|
||||||
|
|
||||||
2000-04-25 Nick Clifton <nickc@cygnus.com>
|
2000-04-25 Nick Clifton <nickc@cygnus.com>
|
||||||
|
|
||||||
* integrate.c (FUNCTION_ATTRIBUTE_INLINABLE_P): If not
|
* integrate.c (FUNCTION_ATTRIBUTE_INLINABLE_P): If not
|
||||||
|
|
|
@ -96,14 +96,20 @@ procopen.o : procopen.c server.h
|
||||||
fixlib.o: machname.h
|
fixlib.o: machname.h
|
||||||
|
|
||||||
fixincl.x: fixincl.tpl inclhack.def
|
fixincl.x: fixincl.tpl inclhack.def
|
||||||
cd $(srcdir) ; ./genfixes $@
|
cd $(srcdir) ; $(SHELL) ./genfixes $@
|
||||||
|
|
||||||
inclhack.sh: inclhack.def inclhack.tpl hackshell.tpl
|
inclhack.sh: inclhack.def inclhack.tpl hackshell.tpl
|
||||||
cd $(srcdir) ; ./genfixes $@
|
cd $(srcdir) ; $(SHELL) ./genfixes $@
|
||||||
|
|
||||||
# fixinc.sh, unlike the other two, has _no_ dependency on the .def file.
|
# fixinc.sh, unlike the other two, has _no_ dependency on the .def file.
|
||||||
fixincl.sh: inclhack.tpl
|
fixincl.sh: inclhack.tpl
|
||||||
cd $(srcdir) ; ./genfixes $@
|
cd $(srcdir) ; $(SHELL) ./genfixes $@
|
||||||
|
|
||||||
|
# This invocation of genfixes is done from the build dir,
|
||||||
|
# not the source dir (as above)
|
||||||
|
#
|
||||||
|
machname.h: ../specs
|
||||||
|
$(SHELL) $(srcdir)/genfixes $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o $(TARGETS) fixincl.x machname.h
|
rm -f *.o $(TARGETS) fixincl.x machname.h
|
||||||
|
@ -113,30 +119,33 @@ clean:
|
||||||
# "inclhack.sh" script. Otherwise, we install that program
|
# "inclhack.sh" script. Otherwise, we install that program
|
||||||
# plus the wrapper script, "fixincl.sh".
|
# plus the wrapper script, "fixincl.sh".
|
||||||
#
|
#
|
||||||
install: $(TARGETS)
|
install-bin: fixincl fixincl.sh
|
||||||
@rm -f ../fixinc.sh ; \
|
@if [ -f ../fixincl ] ; then rm -f ../fixincl || \
|
||||||
if ( ./fixincl -v > /dev/null 2>&1 ) ; then \
|
mv -f ../fixincl ../fixincl.$$ || exit 1 ; fi
|
||||||
echo cp fixincl.sh ../fixinc.sh ; \
|
@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
|
||||||
if [ -f ./fixincl.sh ] ; \
|
mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
|
||||||
then cp fixincl.sh ../fixinc.sh ; \
|
./fixincl -v
|
||||||
else cp $(srcdir)/fixincl.sh ../fixinc.sh ; fi ; \
|
cp fixincl ..
|
||||||
chmod 555 ../fixinc.sh ; \
|
@if [ -f ./fixincl.sh ] ; \
|
||||||
rm -f ../fixincl ; \
|
then echo cp ./fixincl.sh ../fixinc.sh ; \
|
||||||
echo cp fixincl .. ; \
|
cp ./fixincl.sh ../fixinc.sh ; \
|
||||||
cp fixincl .. ; \
|
else echo cp $(srcdir)/fixincl.sh ../fixinc.sh ; \
|
||||||
chmod 555 ../fixincl ; \
|
cp $(srcdir)/fixincl.sh ../fixinc.sh ; fi
|
||||||
else \
|
chmod 755 ../fixinc.sh ../fixincl
|
||||||
echo Could not install binary fixincludes. ; \
|
|
||||||
echo Installing shell script instead. ; \
|
install-sh: fixfixes fixtests inclhack.sh
|
||||||
echo cp inclhack.sh ../fixinc.sh ; \
|
@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
|
||||||
if [ -f ./inclhack.sh ] ; \
|
mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
|
||||||
then cp inclhack.sh ../fixinc.sh ; \
|
echo Could not install binary fixincludes. ; \
|
||||||
else cp $(srcdir)/inclhack.sh ../fixinc.sh ; fi ; \
|
echo Installing shell script instead.
|
||||||
fi
|
@if [ -f ./fixincl.sh ] ; \
|
||||||
|
then echo cp ./inclhack.sh ../fixinc.sh ; \
|
||||||
|
cp ./inclhack.sh ../fixinc.sh ; \
|
||||||
|
else echo cp $(srcdir)/inclhack.sh ../fixinc.sh ; \
|
||||||
|
cp $(srcdir)/inclhack.sh ../fixinc.sh ; fi
|
||||||
|
chmod 755 ../fixinc.sh
|
||||||
|
|
||||||
Makefile: Makefile.in ../config.status
|
Makefile: Makefile.in ../config.status
|
||||||
cd .. \
|
cd .. \
|
||||||
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
|
||||||
|
$(SHELL) ./config.status
|
||||||
machname.h: ../specs
|
|
||||||
$(SHELL) $(srcdir)/genfixes $@
|
|
||||||
|
|
|
@ -117,24 +117,11 @@ fi
|
||||||
|
|
||||||
# OK. We gotta make the thing.
|
# OK. We gotta make the thing.
|
||||||
#
|
#
|
||||||
echo $MAKE SHELL=\"$SHELL\" install
|
echo $MAKE SHELL=\"$SHELL\" install-bin
|
||||||
|
|
||||||
# make and install either the binary or the default script
|
# make and install either the binary or the default script
|
||||||
#
|
#
|
||||||
$MAKE SHELL="$SHELL" install && chmod 755 ${target} && exit 0
|
$MAKE SHELL="$SHELL" install-bin && exit 0
|
||||||
|
|
||||||
# Where is our inclhack script? That is the backup
|
echo $MAKE SHELL=\"$SHELL\" install-sh
|
||||||
# in case we are unable to make a working binary.
|
$MAKE SHELL="$SHELL" install-sh
|
||||||
#
|
|
||||||
if test -f ./inclhack.sh
|
|
||||||
then
|
|
||||||
INCLHACK=./inclhack.sh
|
|
||||||
else
|
|
||||||
INCLHACK=${srcdir}/inclhack.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo Could not install binary fixincludes.
|
|
||||||
echo Installing shell script instead.
|
|
||||||
|
|
||||||
cp ${INCLHACK} ${target}
|
|
||||||
chmod 755 ${target}
|
|
||||||
|
|
Loading…
Reference in New Issue