Skip to content

Commit

Permalink
Merge pull request scop#1214 from scop/pkgutil-automake
Browse files Browse the repository at this point in the history
build: don't install various tools on non-applicable platforms
  • Loading branch information
scop authored Jun 17, 2024
2 parents 165bd32 + 2a838dd commit b9c8bdf
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 10 deletions.
32 changes: 22 additions & 10 deletions completions/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ bashcomp_DATA = 2to3 \
firefox \
flake8 \
_flamegraph \
freebsd-update \
freeciv \
freeciv-server \
function \
Expand Down Expand Up @@ -215,8 +214,6 @@ bashcomp_DATA = 2to3 \
_keyring \
kill \
killall \
kldload \
kldunload \
koji \
_kontena \
ktutil \
Expand Down Expand Up @@ -324,19 +321,14 @@ bashcomp_DATA = 2to3 \
_pipenv \
pkg-config \
pkg-get \
pkg_delete \
pkgadd \
pkgrm \
pkgtool \
pkgutil \
plague-client \
pm-hibernate \
pm-is-supported \
pm-powersave \
pngfix \
portinstall \
portsnap \
portupgrade \
postcat \
postconf \
postfix \
Expand Down Expand Up @@ -503,6 +495,26 @@ bashcomp_DATA = 2to3 \
zopfli \
zopflipng


if SOLARIS
bashcomp_DATA += pkgutil
endif

if BSD
bashcomp_DATA += pkg_delete
endif

if FREEBSD
bashcomp_DATA += \
freebsd-update \
kldload \
kldunload \
portinstall \
portsnap \
portupgrade
endif


EXTRA_DIST = $(bashcomp_DATA)

CLEANFILES = \
Expand Down Expand Up @@ -766,8 +778,6 @@ CLEANFILES = \
ping4 \
ping6 \
_pip3 \
pkg_deinstall \
pkg_info \
pkgconf \
pkill \
plzip \
Expand Down Expand Up @@ -1155,8 +1165,10 @@ symlinks: $(DATA)
_black _blackd _flask _httpx
$(ss) pkg-config \
pkgconf
if BSD
$(ss) pkg_delete \
pkg_deinstall pkg_info
endif
$(ss) pgrep \
pkill
$(ss) pm-hibernate \
Expand Down
21 changes: 21 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,27 @@ AC_ARG_WITH([pytest],[ --with-pytest=executable],[PYTEST="$withval"])
if test "x$PYTEST" = x; then
AC_CHECK_PROGS([PYTEST],[pytest pytest-3],[pytest])
fi

AC_CANONICAL_HOST

build_bsd=
build_freebsd=
build_solaris=
case ${host_os} in
*bsd*)
build_bsd=yes
case ${host_os} in
*freebsd*)
build_freebsd=yes ;;
esac ;;
*solaris*)
build_solaris=yes ;;
esac

AM_CONDITIONAL([BSD], [test "${build_bsd}" = yes])
AM_CONDITIONAL([FREEBSD], [test "${build_freebsd}" = yes])
AM_CONDITIONAL([SOLARIS], [test "${build_solaris}" = yes])

AC_CONFIG_FILES([
Makefile
completions/Makefile
Expand Down

0 comments on commit b9c8bdf

Please sign in to comment.