projects
/
debian
/
cpmtools
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bc00198
)
specify target directory for diskdefs in the rules file install clause
author
Bdale Garbee
<bdale@gag.com>
Thu, 5 Jun 2008 21:41:44 +0000
(15:41 -0600)
committer
Bdale Garbee
<bdale@gag.com>
Thu, 5 Jun 2008 21:41:44 +0000
(15:41 -0600)
debian/rules
patch
|
blob
|
history
diskdefs
patch
|
blob
|
history
diff --git
a/debian/rules
b/debian/rules
index 110b7e3e15be869abc34c9a047fea9ff71a55e3a..43f57a669a87dc3d84b4c8ff3561b05a303d3f8a 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-35,7
+35,8
@@
install: build
dh_testroot
dh_clean -k
dh_installdirs
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
# Build architecture-independent files here.
binary-indep: build install
diff --git
a/diskdefs
b/diskdefs
index 020dfbf9f3eb494b36aca22fb7a0ee22168956a4..7d8a4442a80aa6e063e78bbec89ea94efb4ec2fb 100644
(file)
--- a/
diskdefs
+++ b/
diskdefs
@@
-231,16
+231,6
@@
diskdef p112
tracks 160
sectrk 18
blocksize 2048
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
maxdir 256
skew 1
boottrk 2
@@
-248,22
+238,15
@@
diskdef p112a
end
diskdef p112-old
end
diskdef p112-old
->>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs
seclen 512
tracks 160
sectrk 18
blocksize 2048
seclen 512
tracks 160
sectrk 18
blocksize 2048
-<<<<<<< HEAD:diskdefs
- maxdir 256
-=======
maxdir 128
maxdir 128
->>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs
skew 1
boottrk 1
os 3
end
skew 1
boottrk 1
os 3
end
-<<<<<<< HEAD:diskdefs
-=======
diskdef kpii
seclen 512
diskdef kpii
seclen 512
@@
-275,4
+258,3
@@
diskdef kpii
boottrk 1
os 2.2
end
boottrk 1
os 2.2
end
->>>>>>> 224b4e6d27a3af235500d9d8028ddbd3a60af7ed:diskdefs