- updated to 2.18

[packages/cpmtools.git] / cpmtools-DESTDIR.patch

diff --git a/cpmtools-DESTDIR.patch b/cpmtools-DESTDIR.patch
index 28bd151ddce23306f09b68f167483d3de1f7eaef..042aea5cd7c81fd480a41399e09e575678074ab0 100644 (file)
--- a/cpmtools-DESTDIR.patch
+++ b/cpmtools-DESTDIR.patch
@@ -1,11 +1,12 @@
---- cpmtools-2.16/Makefile.in.orig     2013-09-15 14:35:11.917504540 +0200
-+++ cpmtools-2.16/Makefile.in  2013-09-15 14:37:22.097499077 +0200
-@@ -80,26 +80,26 @@
+--- cpmtools-2.18/Makefile.in.orig     2014-04-16 19:28:58.347561466 +0200
++++ cpmtools-2.18/Makefile.in  2014-04-16 19:31:52.804224499 +0200
+@@ -80,27 +80,28 @@
                -./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
@@ -26,15 +27,17 @@
 -              $(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
-+              $(INSTALL) -D -m 755 cpmls $(DESTDIR)$(BINDIR)/cpmls
-+              $(INSTALL) -D -m 755 cpmcp $(DESTDIR)$(BINDIR)/cpmcp
-+              $(INSTALL) -D -m 755 cpmrm $(DESTDIR)$(BINDIR)/cpmrm
-+              $(INSTALL) -D -m 755 cpmchmod $(DESTDIR)$(BINDIR)/cpmchmod
-+              $(INSTALL) -D -m 755 cpmchattr $(DESTDIR)$(BINDIR)/cpmchattr
-+              $(INSTALL) -D -m 755 mkfs.cpm $(DESTDIR)$(BINDIR)/mkfs.cpm
-+              $(INSTALL) -D -m 755 fsck.cpm $(DESTDIR)$(BINDIR)/fsck.cpm
-+              [ "$(FSED_CPM)" != '' ] && $(INSTALL) -D -m 755 fsed.cpm $(DESTDIR)$(BINDIR)/fsed.cpm
-+              $(INSTALL_DATA) -D diskdefs $(DESTDIR)@datarootdir@/diskdefs
++              [ -d $(DESTDIR)$(BINDIR) ] || $(INSTALL) -m 755 -d $(DESTDIR)$(BINDIR)
++              [ -d $(DESTDIR)@datarootdir@ ] || $(INSTALL) -m 755 -d $(DESTDIR)@datarootdir@
++              $(INSTALL) -m 755 cpmls $(DESTDIR)$(BINDIR)/cpmls
++              $(INSTALL) -m 755 cpmcp $(DESTDIR)$(BINDIR)/cpmcp
++              $(INSTALL) -m 755 cpmrm $(DESTDIR)$(BINDIR)/cpmrm
++              $(INSTALL) -m 755 cpmchmod $(DESTDIR)$(BINDIR)/cpmchmod
++              $(INSTALL) -m 755 cpmchattr $(DESTDIR)$(BINDIR)/cpmchattr
++              $(INSTALL) -m 755 mkfs.cpm $(DESTDIR)$(BINDIR)/mkfs.cpm
++              $(INSTALL) -m 755 fsck.cpm $(DESTDIR)$(BINDIR)/fsck.cpm
++              [ "$(FSED_CPM)" != '' ] && $(INSTALL) -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