X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.in;h=ce5e5fb5305d1d5f3fba28a430c282a69f7366d6;hb=bc00198429aa388947bf035aa5ca6060cd70d9e2;hp=6894e206801bb90388291accfe7ff928b0feb401;hpb=32087c67d53a8f8058b359388f23e2dbc9436d54;p=debian%2Fcpmtools

diff --git a/Makefile.in b/Makefile.in
index 6894e20..ce5e5fb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,6 +6,8 @@ MANDIR=         @mandir@
 includedir=     @includedir@
 exec_prefix=    @exec_prefix@
 prefix=         @prefix@
+datarootdir=	@datarootdir@
+
 INSTALL=        @INSTALL@
 INSTALL_DATA=   @INSTALL_DATA@
 CC=		@CC@
@@ -18,9 +20,9 @@ EXEEXT =        @EXEEXT@
 OBJEXT =        .@OBJEXT@
 LIBS=           @LIBS@ @LDLIBS@
 LDDEPS=		@LDDEPS@
-CPPFLAGS=	-DDISKDEFS=\"@datadir@/diskdefs\" -DFORMAT=\"$(DEFFORMAT)\"
+CPPFLAGS=	@CPPFLAGS@ -DDISKDEFS=\"@datarootdir@/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
@@ -85,7 +87,7 @@ install:	all
 		$(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 @datadir@/diskdefs
+		$(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
@@ -94,12 +96,13 @@ install:	all
 		$(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)