Merge tag 'upstream/2.17'
[debian/cpmtools] / Makefile.in
index 134f021f1da364dc8c099e9d4a2355d762b048a1..679f13d4561d9dedd2c19b0da773df2f49f4c4c8 100644 (file)
@@ -80,6 +80,8 @@ fsck.test:    fsck.cpm
                -./fsck.cpm -f pcw -n badfs/label
 
 install:       all
+               [ -d $(MANDIR)/man1 ] || $(INSTALL) -m 755 -d $(MANDIR)/man1
+               [ -d $(MANDIR)/man5 ] || $(INSTALL) -m 755 -d $(MANDIR)/man5
                $(INSTALL) -s -m 755 cpmls $(BINDIR)/cpmls
                $(INSTALL) -s -m 755 cpmcp $(BINDIR)/cpmcp
                $(INSTALL) -s -m 755 cpmrm $(BINDIR)/cpmrm
@@ -87,8 +89,8 @@ install:      all
                $(INSTALL) -s -m 755 cpmchattr $(BINDIR)/cpmchattr
                $(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
                $(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm
-               [ $(FSED_CPM) != '' ] && $(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
-               $(INSTALL_DATA) diskdefs $(datarootdir)/diskdefs
+               [ "$(FSED_CPM)" != '' ] && $(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
+               $(INSTALL_DATA) diskdefs @datarootdir@/diskdefs
                $(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
                $(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1
                $(INSTALL_DATA) cpmrm.1 $(MANDIR)/man1/cpmrm.1