aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile17
-rw-r--r--PKGBUILD7
-rwxr-xr-xadjtime (renamed from adjtime.cron)0
-rwxr-xr-xinstall.sh27
4 files changed, 20 insertions, 31 deletions
diff --git a/Makefile b/Makefile
index 0ec54ee..d3a1824 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,18 @@
-VER:=$(shell sh -c 'git describe')
+VER := $(shell git describe)
+DIRS := /etc/rc.d /etc/conf.d /etc/rc.d/functions.d /etc/cron.hourly /sbin
-minilogd:
- minilogd.o
+minilogd: minilogd.o
+
+installdirs:
+ install -dm755 $(foreach DIR, $(DIRS), $(DESTDIR)$(DIR))
+
+install: minilogd installdirs
+ install -m644 -t $(DESTDIR)/etc inittab rc.conf
+ install -m644 -t $(DESTDIR)/etc/rc.d functions
+ install -m755 -t $(DESTDIR)/etc rc.local rc.local.shutdown rc.multi rc.shutdown rc.single rc.sysinit
+ install -m755 -t $(DESTDIR)/etc/cron.hourly adjtime
+ install -m755 -t $(DESTDIR)/etc/rc.d functions hwclock network netfs
+ install -m755 -t $(DESTDIR)/sbin minilogd rc
clean:
rm -f minilogd minilogd.o
diff --git a/PKGBUILD b/PKGBUILD
index 79f51f8..c5f2acd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,5 +19,10 @@ sha256sums=()
build() {
cd ..
- DESTDIR=${pkgdir} ./install.sh
+ make
+}
+
+package() {
+ cd ..
+ make DESTDIR="$pkgdir" install
}
diff --git a/adjtime.cron b/adjtime
index 8a894f1..8a894f1 100755
--- a/adjtime.cron
+++ b/adjtime
diff --git a/install.sh b/install.sh
deleted file mode 100755
index e469577..0000000
--- a/install.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-set -e
-
-install -d -m755 ${DESTDIR}/etc/rc.d
-install -d -m755 ${DESTDIR}/etc/conf.d
-install -d -m755 ${DESTDIR}/etc/rc.d/functions.d/
-install -d -m755 ${DESTDIR}/etc/cron.hourly/
-
-for i in inittab rc.conf; do
- install -D -m644 $i ${DESTDIR}/etc/$i
-done
-for i in rc.local rc.local.shutdown rc.multi rc.shutdown rc.single rc.sysinit; do
- install -D -m755 $i ${DESTDIR}/etc/$i
-done
-
-install -D -m755 adjtime.cron ${DESTDIR}/etc/cron.hourly/adjtime
-
-install -D -m644 functions ${DESTDIR}/etc/rc.d/functions
-for i in hwclock network netfs; do
- install -D -m755 $i ${DESTDIR}/etc/rc.d/$i
-done
-
-make minilogd
-install -D -m755 minilogd ${DESTDIR}/sbin/minilogd
-
-install -D -m755 rc ${DESTDIR}/sbin/rc