From 83c4781c639708b9b1671c736ffcbb2c58584479 Mon Sep 17 00:00:00 2001
From: Bruce Korb <bkorb@gnu.org>
Date: Thu, 7 Dec 2000 14:42:39 +0000
Subject: [PATCH] use "exeext" for variables and "build_exeext" for
substitution
From-SVN: r38113
---
gcc/ChangeLog | 5 +++++
gcc/fixinc/Makefile.BEOS | 8 ++++----
gcc/fixinc/Makefile.DOS | 8 ++++----
gcc/fixinc/Makefile.in | 6 +++---
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fa722c646831..0587e1a06e3b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-07 Bruce Korb <bkorb@gnu.org>
+
+ * fixinc/Makefile.*(exeext): the variables are exeext, the
+ substitution expression is build_exeext.
+
2000-12-07 Neil Booth <neilb@earthling.net>
* c-common.c (parse_in): Make a cpp_reader *.
diff --git a/gcc/fixinc/Makefile.BEOS b/gcc/fixinc/Makefile.BEOS
index ca68ff199d89..3994ebda4318 100644
--- a/gcc/fixinc/Makefile.BEOS
+++ b/gcc/fixinc/Makefile.BEOS
@@ -64,19 +64,19 @@ OBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \
HDR = server.h gnu-regex.h fixlib.h machname.h
-TARGETS = fixincl@exeext@ applyfix@exeext@
+TARGETS = fixincl@build_exeext@ applyfix@build_exeext@
all : $(TARGETS)
gen : $(srcdir)/fixincl.x
FIXINCL_OBJ = fixincl.o fixlib.o fixtests.o gnu-regex.o
-fixincl@exeext@: $(FIXINCL_OBJ) $(LIBERTY)
+fixincl@build_exeext@: $(FIXINCL_OBJ) $(LIBERTY)
$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(FIXINCL_OBJ) $(LIBERTY)
APPLY_OBJ = fixfixes.o fixlib.o gnu-regex.o
-applyfix@exeext@: $(APPLY_OBJ) $(LIBERTY)
+applyfix@build_exeext@: $(APPLY_OBJ) $(LIBERTY)
$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(APPLY_OBJ) $(LIBERTY)
$(OBJ) : $(HDR)
@@ -107,7 +107,7 @@ maintainer-clean : clean
# We still copy the script because we still have alternative scripts.
#
install-bin : $(TARGETS)
- ./fixincl@exeext@ -v
+ ./fixincl -v
@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
@if [ -f ./fixincl.sh ] ; \
diff --git a/gcc/fixinc/Makefile.DOS b/gcc/fixinc/Makefile.DOS
index 450ca6b574a3..a606a7a24c63 100644
--- a/gcc/fixinc/Makefile.DOS
+++ b/gcc/fixinc/Makefile.DOS
@@ -64,19 +64,19 @@ OBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \
HDR = server.h gnu-regex.h fixlib.h machname.h
-TARGETS = fixincl@exeext@ applyfix@exeext@
+TARGETS = fixincl@build_exeext@ applyfix@build_exeext@
all : $(TARGETS)
gen : $(srcdir)/fixincl.x
FIXINCL_OBJ = fixincl.o fixlib.o fixtests.o gnu-regex.o
-fixincl@exeext@: $(FIXINCL_OBJ) $(LIBERTY)
+fixincl@build_exeext@: $(FIXINCL_OBJ) $(LIBERTY)
$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(FIXINCL_OBJ) $(LIBERTY)
APPLY_OBJ = fixfixes.o fixlib.o gnu-regex.o
-applyfix@exeext@: $(APPLY_OBJ) $(LIBERTY)
+applyfix@build_exeext@: $(APPLY_OBJ) $(LIBERTY)
$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(APPLY_OBJ) $(LIBERTY)
$(OBJ) : $(HDR)
@@ -107,7 +107,7 @@ maintainer-clean : clean
# We still copy the script because we still have alternative scripts.
#
install-bin : $(TARGETS)
- ./fixincl@exeext@ -v
+ ./fixincl -v
@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
@if [ -f ./fixincl.sh ] ; \
diff --git a/gcc/fixinc/Makefile.in b/gcc/fixinc/Makefile.in
index c0d72d5eeaf7..6213ffd12b8a 100644
--- a/gcc/fixinc/Makefile.in
+++ b/gcc/fixinc/Makefile.in
@@ -64,12 +64,12 @@ OBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \
HDR = server.h gnu-regex.h fixlib.h machname.h
-TARGETS = fixincl@exeext@
+TARGETS = fixincl@build_exeext@
all : $(TARGETS)
gen : $(srcdir)/fixincl.x
-fixincl@exeext@: $(OBJ) $(LIBERTY)
+fixincl@build_exeext@: $(OBJ) $(LIBERTY)
$(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(OBJ) $(LIBERTY)
$(OBJ) : $(HDR)
@@ -100,7 +100,7 @@ maintainer-clean : clean
# We still copy the script because we still have alternative scripts.
#
install-bin : $(TARGETS)
- ./fixincl@exeext@ -v
+ ./fixincl -v
@if [ -f ../fixinc.sh ] ; then rm -f ../fixinc.sh || \
mv -f ../fixinc.sh ../fixinc.sh.$$ || exit 1 ; fi
@if [ -f ./fixincl.sh ] ; \
--
GitLab