Skip to content

Commit 3ebf2bd

Browse files
committed
Makefile.in: Make the version-suffixed executable conditional. [skip ci]
As discussed on tcpdump-workers. This way people that need to compare different tcpdump versions manually have the convenience of automatic versioned executables and people that need to build a package automatically don't have the inconvenience of having to remove the versioned executable from the resulting package.
1 parent 2ec7e78 commit 3ebf2bd

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
6262
Makefile.in: Update the .c.o build rule (Remove hacks for old SunOS 4).
6363
Autoconf: fix buggy tests for ether_ntohost().
6464
CMake: Skip snprintf(3) tests when cross-compiling.
65+
Makefile.in: Do not install a version-suffixed tcpdump binary if the
66+
.devel file does not exists.
6567
Documentation:
6668
man: Clarify the "any" pseudo-interface further.
6769

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ install: all
403403
[ -d $(DESTDIR)$(bindir) ] || \
404404
(mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
405405
$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(PROG)
406-
$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(PROG).`cat ${srcdir}/VERSION`
406+
[ ! -f "${srcdir}/.devel" ] || $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(PROG).`cat ${srcdir}/VERSION`
407407
[ -d $(DESTDIR)$(mandir)/man1 ] || \
408408
(mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
409409
$(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1

0 commit comments

Comments
 (0)