Commit 3ee66bd6 authored by Russ Fish's avatar Russ Fish

Add EXE_SUFFIX so strip works in client-install on CygWin.

parent ba4e5192
......@@ -50,6 +50,7 @@ INSTALL_APACHE_CONFIG = @INSTALL_APACHE_CONFIG@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL@ -m 755
EXE = @EXE_SUFFIX@
INSTALL_DATA = @INSTALL@ -m 444
CLIENT_ETCDIR = @CLIENT_ETCDIR@
......
......@@ -1356,22 +1356,25 @@ fi
if test "$enable_windows" = "yes"; then
winfiles="os/imagezip/ntfs/GNUmakefile \
os/imagezip/ntfs/liblocale/GNUmakefile \
os/imagezip/ntfs/libntfs/GNUmakefile \
os/imagezip/ntfs/liblocale/GNUmakefile \
os/imagezip/ntfs/libntfs/GNUmakefile \
os/imagezip/fat/GNUmakefile"
optional_subdirs="$optional_subdirs";
WINSUPPORT=1;
EXE_SUFFIX=".exe";
WINSUPPORT=1;
else
winfiles="";
WINSUPPORT=0;
EXE_SUFFIX="";
WINSUPPORT=0;
fi
#
# Check for the robot vision system dependencies.
#
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:1375: checking how to run the C preprocessor" >&5
echo "configure:1378: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
......@@ -1386,13 +1389,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 1390 "configure"
#line 1393 "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:1396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
......@@ -1403,13 +1406,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
#line 1407 "configure"
#line 1410 "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:1413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
......@@ -1420,13 +1423,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
#line 1424 "configure"
#line 1427 "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:1430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
......@@ -1454,17 +1457,17 @@ for ac_hdr in linux/videodev.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1458: checking for $ac_hdr" >&5
echo "configure:1461: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1463 "configure"
#line 1466 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
......@@ -1497,7 +1500,7 @@ done
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1501: checking for $ac_word" >&5
echo "configure:1504: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -1569,7 +1572,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:1573: checking for a BSD compatible install" >&5
echo "configure:1576: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -2020,6 +2023,7 @@ s%@INSTALL_APACHE_CONFIG@%$INSTALL_APACHE_CONFIG%g
s%@OPT_CFLAGS@%$OPT_CFLAGS%g
s%@EVENTSYS@%$EVENTSYS%g
s%@WINSUPPORT@%$WINSUPPORT%g
s%@EXE_SUFFIX@%$EXE_SUFFIX%g
s%@CPP@%$CPP%g
s%@GTK_CONFIG@%$GTK_CONFIG%g
s%@HAVE_MEZZANINE@%$HAVE_MEZZANINE%g
......
......@@ -452,16 +452,19 @@ AC_ARG_ENABLE(windows,
if test "$enable_windows" = "yes"; then
winfiles="os/imagezip/ntfs/GNUmakefile \
os/imagezip/ntfs/liblocale/GNUmakefile \
os/imagezip/ntfs/libntfs/GNUmakefile \
os/imagezip/ntfs/liblocale/GNUmakefile \
os/imagezip/ntfs/libntfs/GNUmakefile \
os/imagezip/fat/GNUmakefile"
optional_subdirs="$optional_subdirs";
WINSUPPORT=1;
EXE_SUFFIX=".exe";
WINSUPPORT=1;
else
winfiles="";
WINSUPPORT=0;
EXE_SUFFIX="";
WINSUPPORT=0;
fi
AC_SUBST(WINSUPPORT)
AC_SUBST(EXE_SUFFIX)
#
# Check for the robot vision system dependencies.
......
......@@ -34,7 +34,7 @@ $(OBJS): main.h ../lib/libevent.a
client: delay-agent
client-install: client
$(INSTALL_PROGRAM) -s delay-agent $(DESTDIR)$(CLIENT_BINDIR)/delay-agent
$(INSTALL_PROGRAM) -s delay-agent$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/delay-agent$(EXE)
clean:
/bin/rm -f *.o delay-agent
......@@ -44,7 +44,7 @@ install:
client: $(PROGRAMS)
client-install: client
$(INSTALL_PROGRAM) -s link-agent $(DESTDIR)$(CLIENT_BINDIR)/link-agent
$(INSTALL_PROGRAM) -s link-agent$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/link-agent$(EXE)
clean:
/bin/rm -f *.o $(PROGRAMS)
......@@ -11,8 +11,8 @@ SUBDIR = event/linktest
LIBTBDIR = $(OBJDIR)/lib/libtb
LIBEVENTDIR = ../lib
NSTOIRDIR = $(TESTBED_SRCDIR)/tbsetup/ns2ir
DAEMON = linktest
LTEVENT = ltevent
DAEMON = linktest$(EXE)
LTEVENT = ltevent$(EXE)
SCRIPT = linktest.pl
SCRIPT_RUN = run_linktest.pl
SCRIPT_PROXY = linktest.proxy
......
......@@ -44,7 +44,7 @@ install:
client: $(PROGRAMS)
client-install: client
$(INSTALL_PROGRAM) -s program-agent $(DESTDIR)$(CLIENT_BINDIR)/program-agent
$(INSTALL_PROGRAM) -s program-agent$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/program-agent$(EXE)
clean:
/bin/rm -f *.o $(PROGRAMS)
......@@ -79,7 +79,7 @@ $(PROGRAMS): ../lib/libevent.a ../lib/event.h
client: evproxy
client-install: client
$(INSTALL_PROGRAM) -s evproxy $(DESTDIR)$(CLIENT_BINDIR)/evproxy
$(INSTALL_PROGRAM) -s evproxy$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/evproxy$(EXE)
clean:
/bin/rm -f *.o $(PROGRAMS)
......@@ -61,7 +61,7 @@ control-install: $(INSTALL_BINDIR)/tevc
client: tevc
client-install: client
$(INSTALL_PROGRAM) -s tevc $(DESTDIR)$(CLIENT_BINDIR)/tevc
$(INSTALL_PROGRAM) -s tevc$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/tevc$(EXE)
clean:
rm -f *.o $(PROGRAMS)
......
......@@ -103,7 +103,7 @@ install:
client: $(PROGRAMS)
client-install: client
$(INSTALL_PROGRAM) -s trafgen $(DESTDIR)$(CLIENT_BINDIR)/trafgen
$(INSTALL_PROGRAM) -s trafgen$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/trafgen$(EXE)
clean:
/bin/rm -f lex.yy.c y.* *.o $(PROGRAMS)
......
......@@ -24,7 +24,7 @@ dijkstra: dijkstra.o bitmath.o Compressor.o IpTree.o SingleSource.o \
client: all
client-install: client
$(INSTALL_PROGRAM) -s dijkstra $(DESTDIR)$(CLIENT_BINDIR)/dijkstra
$(INSTALL_PROGRAM) -s dijkstra$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/dijkstra$(EXE)
clean:
rm -f *.o dijkstra
......
......@@ -27,7 +27,7 @@ install: $(INSTALL_LIBEXECDIR)/genhostsfile
client: genhostsfile
client-install: client
$(INSTALL_PROGRAM) -s genhostsfile $(DESTDIR)$(CLIENT_BINDIR)/genhostsfile
$(INSTALL_PROGRAM) -s genhostsfile$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/genhostsfile$(EXE)
clean:
rm -f *.o genhostsfile genfromtopo genfromdb
......@@ -26,7 +26,7 @@ install:
client: all
client-install: client
$(INSTALL_PROGRAM) -s growdisk $(DESTDIR)$(CLIENT_BINDIR)
$(INSTALL_PROGRAM) -s growdisk$(EXE) $(DESTDIR)$(CLIENT_BINDIR)$(EXE)
clean:
rm -f *.o growdisk growdisk.debug
......@@ -130,9 +130,9 @@ install: $(INSTALL_BINDIR)/imagezip $(INSTALL_BINDIR)/imageunzip $(INSTALL_BINDI
client: all
client-install: client
$(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/usr/local/bin
$(INSTALL_PROGRAM) -s imagezip $(DESTDIR)/usr/local/bin/imagezip
$(INSTALL_PROGRAM) -s imageunzip $(DESTDIR)/usr/local/bin/imageunzip
$(INSTALL_PROGRAM) -s imagedump $(DESTDIR)/usr/local/bin/imagedump
$(INSTALL_PROGRAM) -s imagezip$(EXE) $(DESTDIR)/usr/local/bin/imagezip$(EXE)
$(INSTALL_PROGRAM) -s imageunzip$(EXE) $(DESTDIR)/usr/local/bin/imageunzip$(EXE)
$(INSTALL_PROGRAM) -s imagedump$(EXE) $(DESTDIR)/usr/local/bin/imagedump$(EXE)
clean: subdir-clean
rm -f *.o imagezip imageunzip imagedump imagehash version.c
......
......@@ -30,8 +30,8 @@ version.c: emulab-syncd.c
client: all
client-install: client
$(INSTALL_PROGRAM) -s emulab-syncd $(DESTDIR)$(CLIENT_BINDIR)/emulab-syncd
$(INSTALL_PROGRAM) -s emulab-sync $(DESTDIR)$(CLIENT_BINDIR)/emulab-sync
$(INSTALL_PROGRAM) -s emulab$$(EXE)(EXE)-syncd $(DESTDIR)$(CLIENT_BINDIR)/emulab-syncd$(EXE)
$(INSTALL_PROGRAM) -s emulab$(EXE)-sync $(DESTDIR)$(CLIENT_BINDIR)/emulab-sync$(EXE)
$(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)$(CLIENT_MANDIR)/man1
$(INSTALL_PROGRAM) $(SRCDIR)/emulab-syncd.1 $(DESTDIR)$(CLIENT_MANDIR)/man1/emulab-syncd.1
$(INSTALL_PROGRAM) $(SRCDIR)/emulab-sync.1 $(DESTDIR)$(CLIENT_MANDIR)/man1/emulab-sync.1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment