make install would fail to mkdir first.

Signed-off-by: Jorgen Lundman <lundman@lundman.net>
openzfsonosx · Dec 6, 2023 · 7307b68 · 7307b68
1 parent 42aff72
commit 7307b68
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/etc/launchd.d/Makefile.am b/etc/launchd.d/Makefile.am
@@ -10,8 +10,14 @@ do_subst = -$(SED) -e 's,@bindir\@,$(bindir),g' \
 
 CLEANFILES += %D%/zpool-import-all.sh
 
-INSTALL_DATA_HOOKS += install-zpool-import
+INSTALL_DATA_HOOKS += zpool-import-all.sh
 
-install-zpool-import: %D%/zpool-import-all.sh.in
-	$(do_subst) < %D%/zpool-import-all.sh.in > $(DESTDIR)/$(launchdscriptdir)/zpool-import-all.sh
-	chmod +x $(DESTDIR)/$(launchdscriptdir)/zpool-import-all.sh
+zpool-import-all.sh: %D%/zpool-import-all.sh.in
+	-$(AM_V_at)$(MKDIR_P) $(DESTDIR)/$(launchdscriptdir)/
+	-$(AM_V_GEN)$(SED) -e 's,@bindir\@,$(bindir),g' \
+		-e 's,@runstatedir\@,$(runstatedir),g' \
+		-e 's,@sbindir\@,$(sbindir),g' \
+		-e 's,@sysconfdir\@,$(sysconfdir),g' \
+		-e 's,@launchdscriptdir\@,$(launchdscriptdir),g' \
+		'$<' > $(DESTDIR)/$(launchdscriptdir)/'$@'
+	chmod +x $(DESTDIR)/$(launchdscriptdir)/'$@'
diff --git a/etc/launchd/daemons/Makefile.am b/etc/launchd/daemons/Makefile.am
@@ -15,10 +15,11 @@ launchddaemon_DATA = \
 %D%/org.openzfsonosx.InvariantDisks.plist: %D%/org.openzfsonosx.InvariantDisks.plist.in
 
 $(launchddaemon_DATA):
-	-$(SED) -e 's,@bindir\@,$(bindir),g' \
+	-$(AM_V_at)$(MKDIR_P) $(@D)
+	-$(AM_V_GEN)$(SED) -e 's,@bindir\@,$(bindir),g' \
 		-e 's,@runstatedir\@,$(runstatedir),g' \
 		-e 's,@sbindir\@,$(sbindir),g' \
 		-e 's,@sysconfdir\@,$(sysconfdir),g' \
 		-e 's,@launchddaemondir\@,$(launchddaemondir),g' \
 		-e 's,@launchdscriptdir\@,$(launchdscriptdir),g' \
-		'$@.in' >'$@'
+		'$<' >'$@'