Handle if the mountpoint(1) command is from util-linux 2.20+
This commit is contained in:
parent
bfca7da0f5
commit
3cb95c8371
19
src/Makefile
19
src/Makefile
@ -14,6 +14,12 @@ override CFLAGS += -W -Wall -D_GNU_SOURCE
|
|||||||
STATIC =
|
STATIC =
|
||||||
MANDB := s@^\('\\\\\"\)[^\*-]*-\*- coding: [^[:blank:]]\+ -\*-@\1@
|
MANDB := s@^\('\\\\\"\)[^\*-]*-\*- coding: [^[:blank:]]\+ -\*-@\1@
|
||||||
|
|
||||||
|
#
|
||||||
|
# Leave empty if the mountpoint(1) command from util-linux 2.20
|
||||||
|
# and above should be used, otherwise set it to yes.
|
||||||
|
#
|
||||||
|
MNTPOINT=
|
||||||
|
|
||||||
# For some known distributions we do not build all programs, otherwise we do.
|
# For some known distributions we do not build all programs, otherwise we do.
|
||||||
BIN =
|
BIN =
|
||||||
SBIN = init halt shutdown runlevel killall5 fstab-decode
|
SBIN = init halt shutdown runlevel killall5 fstab-decode
|
||||||
@ -25,18 +31,15 @@ MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
|
|||||||
MAN8 += shutdown.8 telinit.8 fstab-decode.8
|
MAN8 += shutdown.8 telinit.8 fstab-decode.8
|
||||||
|
|
||||||
ifeq ($(DISTRO),)
|
ifeq ($(DISTRO),)
|
||||||
BIN += mountpoint
|
|
||||||
SBIN += sulogin bootlogd
|
SBIN += sulogin bootlogd
|
||||||
USRBIN += utmpdump wall
|
USRBIN += utmpdump wall
|
||||||
MAN1 += utmpdump.1 mountpoint.1 wall.1
|
MAN1 += utmpdump.1 wall.1
|
||||||
MAN8 += sulogin.8 bootlogd.8
|
MAN8 += sulogin.8 bootlogd.8
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(DISTRO),Debian)
|
ifeq ($(DISTRO),Debian)
|
||||||
CPPFLAGS+= -DACCTON_OFF
|
CPPFLAGS+= -DACCTON_OFF
|
||||||
BIN += mountpoint
|
|
||||||
SBIN += sulogin bootlogd
|
SBIN += sulogin bootlogd
|
||||||
MAN1 += mountpoint.1
|
|
||||||
MAN8 += sulogin.8 bootlogd.8
|
MAN8 += sulogin.8 bootlogd.8
|
||||||
MANDB :=
|
MANDB :=
|
||||||
endif
|
endif
|
||||||
@ -49,14 +52,18 @@ endif
|
|||||||
|
|
||||||
ifeq ($(DISTRO),SuSE)
|
ifeq ($(DISTRO),SuSE)
|
||||||
CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE
|
CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE
|
||||||
BIN += mountpoint
|
|
||||||
SBIN += sulogin
|
SBIN += sulogin
|
||||||
USRBIN += utmpdump
|
USRBIN += utmpdump
|
||||||
MAN1 += utmpdump.1 mountpoint.1
|
MAN1 += utmpdump.1
|
||||||
MAN8 += sulogin.8
|
MAN8 += sulogin.8
|
||||||
MANDB :=
|
MANDB :=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(MNTPOINT),yes)
|
||||||
|
BIN += mountpoint
|
||||||
|
MAN1 += mountpoint.1
|
||||||
|
endif
|
||||||
|
|
||||||
ID = $(shell id -u)
|
ID = $(shell id -u)
|
||||||
BIN_OWNER = root
|
BIN_OWNER = root
|
||||||
BIN_GROUP = root
|
BIN_GROUP = root
|
||||||
|
Loading…
Reference in New Issue
Block a user