From 2cf03dead1279a79292b15408e6ae621bb837430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jake=20Buchholz=20G=C3=B6kt=C3=BCrk?= Date: Thu, 14 Jul 2022 08:00:56 -0700 Subject: [PATCH] * more Makefile tweaks --- Makefile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 84a29d4..407bab2 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,6 @@ SUBPACKAGES = core network openrc aws azure gcp oci nocloud .PHONY: install $(SUBPACKAGES) install: $(SUBPACKAGES) - install -Dm644 lib/tiny-cloud.conf \ - "$(PREFIX)"/etc/conf.d/tiny-cloud core: install -Dm755 -t "$(PREFIX)"/bin \ @@ -16,6 +14,8 @@ core: lib/tiny-cloud/init-* \ lib/tiny-cloud/mdev \ lib/tiny-cloud/tiny-cloud.conf + install -Dm644 lib/tiny-cloud.conf \ + "$(PREFIX)"/etc/conf.d/tiny-cloud network: install -Dm644 -t "$(PREFIX)"/etc/network/interfaces.d \ @@ -31,27 +31,24 @@ openrc: install -Dm755 -t "$(PREFIX)"/etc/init.d \ etc/init.d/* -aws: conf_dir +aws: install -Dm755 -t "$(PREFIX)"/lib/mdev \ lib/mdev/nvme-ebs-links install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud/aws \ lib/tiny-cloud/aws/* -azure: conf_dir +azure: install -Dm644 -t $(PREFIX)/lib/tiny-cloud/azure \ lib/tiny-cloud/azure/* -gcp: conf_dir +gcp: install -Dm644 -t $(PREFIX)/lib/tiny-cloud/gcp \ lib/tiny-cloud/gcp/* -oci: conf_dir +oci: install -Dm644 -t $(PREFIX)/lib/tiny-cloud/oci \ lib/tiny-cloud/oci/* -nocloud: conf_dir +nocloud: install -Dm644 -t $(PREFIX)/lib/tiny-cloud/nocloud \ - lib/tiny-cloud/nocloud/* - -conf_dir: - mkdir -p "$(PREFIX)"/etc/conf.d + lib/tiny-cloud/nocloud/* \ No newline at end of file