Skip to content

Commit

Permalink
Fix "make depend" in rpcapd if we can't generate dependencies.
Browse files Browse the repository at this point in the history
Have a "nomkdep" script that does nothing, and run it, rather than using
the built-in ":" command.  That way, in the rpcapd directory, we don't
try to run ../: and fail, we try to run ../nomkdep and succeed.
  • Loading branch information
guyharris committed Nov 25, 2017
1 parent 8a23ca9 commit 95b4860
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
1 change: 1 addition & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ EXTRA_DIST = \
msdos/pktdrvr.c \
msdos/pktdrvr.h \
msdos/readme.dos \
nomkdep \
org.tcpdump.chmod_bpf.plist \
pcap-bpf.c \
pcap-bt-linux.c \
Expand Down
4 changes: 2 additions & 2 deletions aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ AC_DEFUN(AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT,
# We can't run mkdep, so have "make depend" do
# nothing.
#
MKDEP=:
MKDEP=nomkdep
fi
rm -rf conftest*
else
Expand All @@ -404,7 +404,7 @@ AC_DEFUN(AC_LBL_CHECK_DEPENDENCY_GENERATION_OPT,
# We can't run mkdep, so have "make depend" do
# nothing.
#
MKDEP=:
MKDEP=nomkdep
fi
AC_SUBST(DEPENDENCY_CFLAG)
AC_SUBST(MKDEP)
Expand Down
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -8935,7 +8935,7 @@ $as_echo "no" >&6; }
# We can't run mkdep, so have "make depend" do
# nothing.
#
MKDEP=:
MKDEP=nomkdep
fi
rm -rf conftest*
else
Expand All @@ -8945,7 +8945,7 @@ $as_echo "no" >&6; }
# We can't run mkdep, so have "make depend" do
# nothing.
#
MKDEP=:
MKDEP=nomkdep
fi


Expand Down
6 changes: 6 additions & 0 deletions nomkdep
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh -
#
# Does nothing; used if we don't have a command-line flag to the compiler
# to get it to generate dependencies.
#
exit 0

0 comments on commit 95b4860

Please sign in to comment.