Install directly to .data dirs. Don't use oh-*.

3 files changed, 21 insertions, 36 deletions

diff --git a/build b/build
index 38d0f09..94eedbc 100755
--- a/build
+++ b/build
@@ -18,43 +18,32 @@ nop:
 
 build:
 	for t in $(tables); do \
-		/usr/sbin/zic -d dest/usr/share/zoneinfo \
+		/usr/sbin/zic -d tzdata-$${t}.data/usr/share/zoneinfo \
 			-L /dev/null -y yearistype.sh \
 			src/$${t} || exit $?; \
 	done
-	/usr/sbin/zic -d dest/usr/share/zoneinfo -p America/New_York
 	touch $@
 
 install: build
-	cp src/iso3166.tab src/zone.tab dest/usr/share/zoneinfo
-	(cd src && grep '^Link' $(tables)) | while read type dest src etc; do \
-		rm -f "dest/usr/share/zoneinfo/$${src}"; \
-		link="$${src}" up=''; \
-		while [ "$${link#*/}" != "$${link}" ] && \
-		      [ "$${link%%/*}" = "$${dest%%/*}" ]; do \
-			link="$${link#*/}"; \
-			dest="$${dest#*/}"; \
-		done; \
-		while [ "$${link#*/}" != "$${link}" ]; do \
-			link="$${link#*/}"; \
-			up="../$${up}"; \
-		done; \
-		ln -sf "$${up}$${dest}" \
-			"dest/usr/share/zoneinfo/$${src}"; \
-	done
+	mkdir -p tzdata-common.data/usr/share/zoneinfo
+	cp src/iso3166.tab src/zone.tab tzdata-common.data/usr/share/zoneinfo
+	cp -p tzdata-northamerica.data/usr/share/zoneinfo/America/New_York \
+		tzdata-common.data/usr/share/zoneinfo
 	for t in $(tables); do \
-		exec 3>../tzdata-$${t}.pkg/files; \
-		grep '^Zone' src/$${t} | while read type zone etc; do \
-			printf '/usr/share/zoneinfo/%s\n' "$${zone}" >&3; \
+		grep '^Link' src/$${t} | while read type dest src etc; do \
+			rm -f "tzdata-$${t}.data/usr/share/zoneinfo/$${src}"; \
+			link="$${src}" up=''; \
+			while [ "$${link#*/}" != "$${link}" ] && \
+			      [ "$${link%%/*}" = "$${dest%%/*}" ]; do \
+				link="$${link#*/}"; \
+				dest="$${dest#*/}"; \
+			done; \
+			while [ "$${link#*/}" != "$${link}" ]; do \
+				link="$${link#*/}"; \
+				up="../$${up}"; \
+			done; \
+			ln -sf "$${up}$${dest}" \
+				"tzdata-$${t}.data/usr/share/zoneinfo/$${src}"; \
 		done; \
-		grep '^Link' src/$${t} | while read type link zone etc; do \
-			printf '/usr/share/zoneinfo/%s\n' "$${zone}" >&3; \
-		done; \
-		exec 3>&-; \
-	done
-	ln -sf . dest/usr/share/zoneinfo/posix
-	oh-fixperms
-	oh-installfiles
-	for t in $(tables); do \
-		rm -f ../tzdata-$${t}.pkg/files; \
 	done
+	ln -sf . tzdata-common.data/usr/share/zoneinfo/posix
diff --git a/control b/control
index 12c9d09..164d0c6 100644
--- a/control
+++ b/control
@@ -1,3 +1,3 @@
 Maintainer: "P. J. McDermott" <pjm@nac.net>
-Build-Depends: opkhelper-3.0, tzcode
+Build-Depends: tzcode
 Homepage: https://www.iana.org/time-zones
diff --git a/tzdata-common.pkg/files b/tzdata-common.pkg/files
deleted file mode 100644
index 30cbcae..0000000
--- a/tzdata-common.pkg/files
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/share/zoneinfo/posix
-/usr/share/zoneinfo/posixrules
-/usr/share/zoneinfo/iso3166.tab
-/usr/share/zoneinfo/zone.tab