add to rules to get diskdefs in a compliant location again

[debian/cpmtools] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4fdafceef63e1ff360ff0adc16b47afb9ecc971b..02bb52410e0773c99167c67d6c85766450ec035b 100644 (file)
--- 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
@@ -59,8 +62,8 @@ mkfs.cpm$(EXEEXT):    mkfs.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJ
 fsck.cpm$(EXEEXT):     fsck.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LDDEPS)
                $(CC) $(LDFLAGS) -o $@ fsck.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LIBS)
 
-fsed.cpm$(EXEEXT):     fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LDDEPS)
-               $(CC) $(LDFLAGS) -o $@ fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LIBS)
+fsed.cpm$(EXEEXT):     fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) term_curses$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LDDEPS)
+               $(CC) $(LDFLAGS) -o $@ fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) term_curses$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LIBS)
 
 fsck.test:     fsck.cpm
                -./fsck.cpm -f ibm-3740 -n badfs/status
@@ -77,30 +80,34 @@ fsck.test:  fsck.cpm
                -./fsck.cpm -f pcw -n badfs/label
 
 install:       all
-               $(INSTALL) -s -m 755 cpmls $(BINDIR)/cpmls
-               $(INSTALL) -s -m 755 cpmcp $(BINDIR)/cpmcp
-               $(INSTALL) -s -m 755 cpmrm $(BINDIR)/cpmrm
-               $(INSTALL) -s -m 755 cpmchmod $(BINDIR)/cpmchmod
-               $(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 @datadir@/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) 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
+               [ -d $(DESTDIR)$(MANDIR)/man1 ] || $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man1
+               [ -d $(DESTDIR)$(MANDIR)/man5 ] || $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man5
+               [ -d $(DESTDIR)$(BINDIR) ] || $(INSTALL) -m 755 -d $(DESTDIR)$(BINDIR)
+               $(INSTALL) -s -m 755 cpmls $(DESTDIR)$(BINDIR)/cpmls
+               $(INSTALL) -s -m 755 cpmcp $(DESTDIR)$(BINDIR)/cpmcp
+               $(INSTALL) -s -m 755 cpmrm $(DESTDIR)$(BINDIR)/cpmrm
+               $(INSTALL) -s -m 755 cpmchmod $(DESTDIR)$(BINDIR)/cpmchmod
+               $(INSTALL) -s -m 755 cpmchattr $(DESTDIR)$(BINDIR)/cpmchattr
+               $(INSTALL) -s -m 755 mkfs.cpm $(DESTDIR)$(BINDIR)/mkfs.cpm
+               $(INSTALL) -s -m 755 fsck.cpm $(DESTDIR)$(BINDIR)/fsck.cpm
+               [ "$(FSED_CPM)" = '' ] || $(INSTALL) -s -m 755 fsed.cpm $(DESTDIR)$(BINDIR)/fsed.cpm
+               $(INSTALL_DATA) diskdefs $(DESTDIR)@datarootdir@/diskdefs
+               $(INSTALL_DATA) cpmls.1 $(DESTDIR)$(MANDIR)/man1/cpmls.1
+               $(INSTALL_DATA) cpmcp.1 $(DESTDIR)$(MANDIR)/man1/cpmcp.1
+               $(INSTALL_DATA) cpmrm.1 $(DESTDIR)$(MANDIR)/man1/cpmrm.1
+               $(INSTALL_DATA) cpmchmod.1 $(DESTDIR)$(MANDIR)/man1/cpmchmod.1
+               $(INSTALL_DATA) cpmchattr.1 $(DESTDIR)$(MANDIR)/man1/cpmchattr.1
+               $(INSTALL_DATA) mkfs.cpm.1 $(DESTDIR)$(MANDIR)/man1/mkfs.cpm.1
+               $(INSTALL_DATA) fsck.cpm.1 $(DESTDIR)$(MANDIR)/man1/fsck.cpm.1
+               $(INSTALL_DATA) fsed.cpm.1 $(DESTDIR)$(MANDIR)/man1/fsed.cpm.1
+               $(INSTALL_DATA) cpm.5 $(DESTDIR)$(MANDIR)/man5/cpm.5
+               $(INSTALL_DATA) diskdefs.5 $(DESTDIR)$(MANDIR)/man5/diskdefs.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)