X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.in;h=d42f73a0e5ef541d2e269eb2e54bca65c1b4cf91;hb=21a985214c217db63fd2679bc0b9b743a5063901;hp=b6b4dba68c7a85827d4d9ce9ce08591d1611cbfa;hpb=e973cfefb89d99b99d2d52720badd33f5642a88f;p=debian%2Fcpmtools

diff --git a/Makefile.in b/Makefile.in
index b6b4dba..d42f73a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,13 +14,14 @@ CC=		@CC@
 CFLAGS=		@CFLAGS@
 LDFLAGS=        @LDFLAGS@
 DEFFORMAT=      @DEFFORMAT@
+DISKDEFS=	@DISKDEFS@
 DEVICE=         @DEVICE@
 FSED_CPM=       @FSED_CPM@
 EXEEXT =        @EXEEXT@
 OBJEXT =        .@OBJEXT@
 LIBS=           @LIBS@ @LDLIBS@
 LDDEPS=		@LDDEPS@
-CPPFLAGS=	@CPPFLAGS@ -DDISKDEFS=\"@datarootdir@/diskdefs\" -DFORMAT=\"$(DEFFORMAT)\"
+CPPFLAGS=	@CPPFLAGS@ -DDISKDEFS=\"$(DISKDEFS)\" -DFORMAT=\"$(DEFFORMAT)\"
 #
 # I'm only a novice and I haven't worked out how to autoconf this one
 #
@@ -79,6 +80,9 @@ 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
+		[ -d $(BINDIR) ] || $(INSTALL) -m 755 -d $(BINDIR)
 		$(INSTALL) -s -m 755 cpmls $(BINDIR)/cpmls
 		$(INSTALL) -s -m 755 cpmcp $(BINDIR)/cpmcp
 		$(INSTALL) -s -m 755 cpmrm $(BINDIR)/cpmrm
@@ -86,14 +90,13 @@ 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
-		$(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
-		# a little ugly... we know prefix for Debian is /usr, so...
-		$(INSTALL_DATA) diskdefs $(prefix)/../@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
 		$(INSTALL_DATA) cpmchmod.1 $(MANDIR)/man1/cpmchmod.1
-		$(INSTALL_DATA) cpmchmod.1 $(MANDIR)/man1/cpmchattr.1
+		$(INSTALL_DATA) cpmchattr.1 $(MANDIR)/man1/cpmchattr.1
 		$(INSTALL_DATA) mkfs.cpm.1 $(MANDIR)/man1/mkfs.cpm.1
 		$(INSTALL_DATA) fsck.cpm.1 $(MANDIR)/man1/fsck.cpm.1
 		$(INSTALL_DATA) fsed.cpm.1 $(MANDIR)/man1/fsed.cpm.1