diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-06-06 10:58:05 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-06-06 10:58:05 (EDT) |
| commit | 3c689df49870a683430871630b88be529bbe3400 (patch) | |
| tree | 0befe54eab0de782f714d81fbbe7b4919d744c82 | |
| parent | 21f36759b6df8a8c98b2617a4f9c8df09763ddcb (diff) | |
tzselect, zdump, zic, tzcode-doc: Don't use oh-installfiles
Instead, install everything directly to .data directories and run
oh-fixperms and oh-strip over all of them at the end.
| -rwxr-xr-x | build | 18 | ||||
| -rw-r--r-- | tzcode-doc.pkg/files | 1 | ||||
| -rw-r--r-- | tzselect.pkg/files | 1 | ||||
| -rw-r--r-- | zdump.pkg/files | 1 | ||||
| -rw-r--r-- | zic.pkg/files | 1 |
5 files changed, 11 insertions, 11 deletions
@@ -18,13 +18,13 @@ build: touch $@ install: build - install -D src/tzselect src/zdump dest/usr/bin - install -D src/zic dest/usr/sbin - install -D src/tzfile.5 dest/usr/share/man/man5 - install -D src/tzselect.8 src/zdump.8 src/zic.8 dest/usr/share/man/man8 - oh-fixperms - oh-strip - oh-installfiles + install -D src/tzselect tzselect.data/usr/bin + install -D src/zdump zdump.data/usr/bin + install -D src/zic zic.data/usr/sbin + install -D src/tzfile.5 tzdata-doc.data/usr/share/man/man5 + install -D src/tzselect.8 tzdata-doc.data/usr/share/man/man8 + install -D src/zdump.8 tzdata-doc.data/usr/share/man/man8 + install -D src/zic.8 tzdata-doc.data/usr/share/man/man8 # Install country and zone tables used by tzselect. cp src/*.tab tzdata.data/usr/share/zoneinfo # Install Factory zone. @@ -76,3 +76,7 @@ install: build mv tzdata-northamerica.data/usr/share/zoneinfo/America/New_York \ tzdata.data/usr/share/zoneinfo/America ln -sf America/New_York tzdata.data/usr/share/zoneinfo/posixrules + set -e; for p $(OPK_PACKAGES); do \ + oh-fixperms -d "$${p}.data"; \ + oh-strip -d "$${p}.data"; \ + done diff --git a/tzcode-doc.pkg/files b/tzcode-doc.pkg/files deleted file mode 100644 index 0ddb634..0000000 --- a/tzcode-doc.pkg/files +++ /dev/null @@ -1 +0,0 @@ -/usr/share/man diff --git a/tzselect.pkg/files b/tzselect.pkg/files deleted file mode 100644 index 43aedd7..0000000 --- a/tzselect.pkg/files +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/tzselect diff --git a/zdump.pkg/files b/zdump.pkg/files deleted file mode 100644 index 5498131..0000000 --- a/zdump.pkg/files +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/zdump diff --git a/zic.pkg/files b/zic.pkg/files deleted file mode 100644 index df928d5..0000000 --- a/zic.pkg/files +++ /dev/null @@ -1 +0,0 @@ -/usr/sbin/zic |