Imported Upstream version 2.7

[debian/cpmtools] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 76eaa119599cc4fe6aa9c1faf20eeefaa7fad7f9..ce5e5fb5305d1d5f3fba28a430c282a69f7366d6 100644 (file)
--- 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,7 +20,7 @@ EXEEXT =        @EXEEXT@
 OBJEXT =        .@OBJEXT@
 LIBS=           @LIBS@ @LDLIBS@
 LDDEPS=                @LDDEPS@
-CPPFLAGS=      -DDISKDEFS=\"@datadir@/diskdefs\" -DFORMAT=\"$(DEFFORMAT)\"
+CPPFLAGS=      @CPPFLAGS@ -DDISKDEFS=\"@datarootdir@/diskdefs\" -DFORMAT=\"$(DEFFORMAT)\"
 #
 # I'm only a novice and I haven't worked out how to autoconf this one
 #
@@ -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
@@ -97,7 +99,7 @@ install:      all
                $(INSTALL_DATA) cpm.5 $(MANDIR)/man5/cpm.5
 
 clean:
-               rm -f *$(OBJEXT) *.1 *.5
+               rm -f *$(OBJEXT)
 
 distclean:     clean
                rm -rf $(ALL) autom4te.cache config.log config.cache config.h config.status Makefile *.out