X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.in;h=134f021f1da364dc8c099e9d4a2355d762b048a1;hb=5e15a17ecb491f9f41c34c1db6571b5fc69c21bc;hp=f48459356006d7ec86561bfc4662e40f224e4e45;hpb=2a2375494aec4046c4b0ef4fa89ee9adf132ea3b;p=debian%2Fcpmtools

diff --git a/Makefile.in b/Makefile.in
index f484593..134f021 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,21 +6,24 @@ MANDIR=         @mandir@
 includedir=     @includedir@
 exec_prefix=    @exec_prefix@
 prefix=         @prefix@
+datarootdir=	@datarootdir@
+
 INSTALL=        @INSTALL@
 INSTALL_DATA=   @INSTALL_DATA@
 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=	-DDISKDEFS=\"@datadir@/diskdefs\" -DFORMAT=\"$(DEFFORMAT)\"
+CPPFLAGS=	@CPPFLAGS@ -DDISKDEFS=\"$(DISKDEFS)\" -DFORMAT=\"$(DEFFORMAT)\"
 #
-# [JCE] I'm only a novice and I haven't worked out how to autoconf this one
+# I'm only a novice and I haven't worked out how to autoconf this one
 #
 
 #MAKEDEPEND=	mkdep -d
@@ -84,23 +87,23 @@ 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
-		$(INSTALL_DATA) diskdefs $(prefix)/..@datadir@/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
 		$(INSTALL_DATA) cpm.5 $(MANDIR)/man5/cpm.5
 
 clean:
-		rm -f *$(OBJEXT) *.1 *.5
+		rm -f *$(OBJEXT)
 
 distclean:	clean
-		rm -f $(ALL) config.log config.cache config.h config.status Makefile *.out 
+		rm -rf $(ALL) autom4te.cache config.log config.cache config.h config.status Makefile *.out 
 
 tar:		distclean
 		(b=`pwd`; b=`basename $$b`; cd ..; tar zcvf $$b.tar.gz $$b)