summaryrefslogtreecommitdiff
path: root/strata/foundation
diff options
context:
space:
mode:
Diffstat (limited to 'strata/foundation')
-rw-r--r--strata/foundation/pciutils.morph12
-rw-r--r--strata/foundation/systemd.morph2
2 files changed, 7 insertions, 7 deletions
diff --git a/strata/foundation/pciutils.morph b/strata/foundation/pciutils.morph
index 8ca13bad..03bd4a23 100644
--- a/strata/foundation/pciutils.morph
+++ b/strata/foundation/pciutils.morph
@@ -1,11 +1,11 @@
name: pciutils
kind: chunk
configure-commands:
-- make ZLIB=no lib/config.mk
-- echo PREFIX=$PREFIX >>lib/config.mk
-- echo MANDIR=$PREFIX/share/man >>lib/config.mk
+- make PREFIX="$PREFIX" ZLIB=no lib/config.mk
+- echo PREFIX="$PREFIX" >>lib/config.mk
+- echo MANDIR="$PREFIX/share/man" >>lib/config.mk # ensure manpages are always installed in share/man
build-commands:
-- make
+- make PREFIX="$PREFIX"
install-commands:
-- make DESTDIR="$DESTDIR" install
-- make DESTDIR="$DESTDIR" install-lib
+- make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install
+- make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install-lib
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index 1ee23cb8..c298748a 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -21,7 +21,7 @@ post-install-commands:
- |
cat > "$DESTDIR/etc/systemd/network/10-dhcp.network" << "EOF"
[Match]
- Name=en*
+ Name=e*
[Network]
DHCP=yes