summaryrefslogtreecommitdiff
path: root/disk-utils
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2006-12-07 00:26:00 +0100
committerKarel Zak <kzak@redhat.com>2006-12-07 00:26:00 +0100
commitf0c8eda12c410fb56630de47f6d50cac15f7529a (patch)
tree4531e56b1873ce6b4e5db4bf4684f5daa4e1257e /disk-utils
parent63cccae4684f83d2a462bc8abf24e51d1bd6efb6 (diff)
downloadutil-linux-old-f0c8eda12c410fb56630de47f6d50cac15f7529a.tar.gz
Imported from util-linux-2.11u tarball.
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/disk-utils/Makefile b/disk-utils/Makefile
index 8c9543fb..45e3f09b 100644
--- a/disk-utils/Makefile
+++ b/disk-utils/Makefile
@@ -14,13 +14,14 @@ MAN8= blockdev.8 fdformat.8 isosize.8 mkfs.8 mkswap.8 elvtune.8 \
# Where to put binaries?
# See the "install" rule for the links. . .
-SBIN= mkfs mkswap blockdev elvtune fsck.minix mkfs.minix mkfs.bfs \
- fsck.cramfs mkfs.cramfs
+SBIN= mkfs mkswap blockdev elvtune fsck.minix mkfs.minix mkfs.bfs
USRBIN= fdformat isosize
ETC= fdprm
+MAYBE= setfdprm raw fsck.cramfs mkfs.cramfs
+
ifneq "$(HAVE_FDUTILS)" "yes"
USRBIN:=$(USRBIN) setfdprm
MAN8:=$(MAN8) setfdprm.8
@@ -31,6 +32,10 @@ USRBIN:=$(USRBIN) raw
MAN8:=$(MAN8) raw.8
endif
+ifeq "$(HAVE_ZLIB)" "yes"
+SBIN:=$(SBIN) fsck.cramfs mkfs.cramfs
+endif
+
all: $(SBIN) $(USRBIN)
fsck.cramfs: fsck.cramfs.o
@@ -55,4 +60,4 @@ endif
.PHONY: clean
clean:
- -rm -f *.o *~ core $(SBIN) $(USRBIN) raw
+ -rm -f *.o *~ core $(SBIN) $(USRBIN) $(MAYBE)