From ea615857ef3f9f24b47df7c1781df2e46670db39 Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Thu, 5 Jun 2008 15:41:44 -0600
Subject: [PATCH] specify target directory for diskdefs in the rules file
 install clause

---
 debian/rules |  3 ++-
 diskdefs     | 18 ------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/debian/rules b/debian/rules
index 110b7e3..43f57a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,8 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install prefix=$(CURDIR)/debian/cpmtools/usr 
+	$(MAKE) install prefix=$(CURDIR)/debian/cpmtools/usr \
+		datarootdir=$(CURDIR)/debian/cpmtools/etc/cpmtools
 
 # Build architecture-independent files here.
 binary-indep: build install
diff --git a/diskdefs b/diskdefs
index 020dfbf..7d8a444 100644
--- a/diskdefs
+++ b/diskdefs
@@ -231,16 +231,6 @@ diskdef p112
   tracks 160
   sectrk 18
   blocksize 2048
-<<<<<<< HEAD:diskdefs
-  maxdir 128
-  skew 1
-  boottrk 1
-  os 3
-end
-
-
-diskdef p112a
-=======
   maxdir 256
   skew 1
   boottrk 2
@@ -248,22 +238,15 @@ diskdef p112a
 end
 
 diskdef p112-old
->>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs
   seclen 512
   tracks 160
   sectrk 18
   blocksize 2048
-<<<<<<< HEAD:diskdefs
-  maxdir 256
-=======
   maxdir 128
->>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs
   skew 1
   boottrk 1
   os 3
 end
-<<<<<<< HEAD:diskdefs
-=======
 
 diskdef kpii
   seclen 512
@@ -275,4 +258,3 @@ diskdef kpii
   boottrk 1
   os 2.2
 end
->>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs
-- 
2.30.2