Use perl instead of sed to conditionally remove lines from Makefiles

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 9bb09a6fd9ea0792999c2e41bc96748ea2d8d81d..40030a515e85c4296c0dc84e69c388932b14c848 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1515,43 +1515,43 @@ if HAVE_SYSTEMD
 pdns.service: pdns.service.in
        $(AM_V_GEN)sed -e 's![@]sbindir[@]!$(sbindir)!' < $< > $@
 if !HAVE_SYSTEMD_LOCK_PERSONALITY
-       $(AM_V_GEN)sed -i '' -e '/^LockPersonality/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^LockPersonality/' $@
 endif
 if !HAVE_SYSTEMD_PRIVATE_DEVICES
-       $(AM_V_GEN)sed -i '' -e '/^PrivateDevices/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^PrivateDevices/' $@
 endif
 if !HAVE_SYSTEMD_PRIVATE_TMP
-       $(AM_V_GEN)sed -i '' -e '/^PrivateTmp/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^PrivateTmp/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_CONTROL_GROUPS
-       $(AM_V_GEN)sed -i '' -e '/^ProtectControlGroups/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectControlGroups/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_HOME
-       $(AM_V_GEN)sed -i '' -e '/^ProtectHome/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectHome/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_KERNEL_MODULES
-       $(AM_V_GEN)sed -i '' -e '/^ProtectKernelModules/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectKernelModules/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_KERNEL_TUNABLES
-       $(AM_V_GEN)sed -i '' -e '/^ProtectKernelTunables/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectKernelTunables/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_SYSTEM
-       $(AM_V_GEN)sed -i '' -e '/^ProtectSystem/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectSystem/' $@
 endif
 if !HAVE_SYSTEMD_RESTRICT_ADDRESS_FAMILIES
-       $(AM_V_GEN)sed -i '' -e '/^RestrictAddressFamilies/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^RestrictAddressFamilies/' $@
 endif
 if !HAVE_SYSTEMD_RESTRICT_NAMESPACES
-       $(AM_V_GEN)sed -i '' -e '/^RestrictNamespaces/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^RestrictNamespaces/' $@
 endif
 if !HAVE_SYSTEMD_RESTRICT_REALTIME
-       $(AM_V_GEN)sed -i '' -e '/^RestrictRealtime/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^RestrictRealtime/' $@
 endif
 if !HAVE_SYSTEMD_SYSTEM_CALL_ARCHITECTURES
-       $(AM_V_GEN)sed -i '' -e '/^SystemCallArchitectures/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^SystemCallArchitectures/' $@
 endif
 if !HAVE_SYSTEMD_SYSTEM_CALL_FILTER
-       $(AM_V_GEN)sed -i '' -e '/^SystemCallFilter/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^SystemCallFilter/' $@
 endif
 
 pdns@.service: pdns.service

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 578f4643c8440c7a3ce87e276a2014dd6d16e2d4..ceeb6d04048aef9f151cb51b60be921855be2a60 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -324,43 +324,43 @@ if HAVE_SYSTEMD
 dnsdist.service: dnsdist.service.in
        $(AM_V_GEN)sed -e 's![@]bindir[@]!$(bindir)!' < $< > $@
 if !HAVE_SYSTEMD_LOCK_PERSONALITY
-       $(AM_V_GEN)sed -i '' -e '/^LockPersonality/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^LockPersonality/' $@
 endif
 if !HAVE_SYSTEMD_PRIVATE_DEVICES
-       $(AM_V_GEN)sed -i '' -e '/^PrivateDevices/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^PrivateDevices/' $@
 endif
 if !HAVE_SYSTEMD_PRIVATE_TMP
-       $(AM_V_GEN)sed -i '' -e '/^PrivateTmp/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^PrivateTmp/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_CONTROL_GROUPS
-       $(AM_V_GEN)sed -i '' -e '/^ProtectControlGroups/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectControlGroups/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_HOME
-       $(AM_V_GEN)sed -i '' -e '/^ProtectHome/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectHome/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_KERNEL_MODULES
-       $(AM_V_GEN)sed -i '' -e '/^ProtectKernelModules/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectKernelModules/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_KERNEL_TUNABLES
-       $(AM_V_GEN)sed -i '' -e '/^ProtectKernelTunables/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectKernelTunables/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_SYSTEM
-       $(AM_V_GEN)sed -i '' -e '/^ProtectSystem/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectSystem/' $@
 endif
 if !HAVE_SYSTEMD_RESTRICT_ADDRESS_FAMILIES
-       $(AM_V_GEN)sed -i '' -e '/^RestrictAddressFamilies/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^RestrictAddressFamilies/' $@
 endif
 if !HAVE_SYSTEMD_RESTRICT_NAMESPACES
-       $(AM_V_GEN)sed -i '' -e '/^RestrictNamespaces/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^RestrictNamespaces/' $@
 endif
 if !HAVE_SYSTEMD_RESTRICT_REALTIME
-       $(AM_V_GEN)sed -i '' -e '/^RestrictRealtime/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^RestrictRealtime/' $@
 endif
 if !HAVE_SYSTEMD_SYSTEM_CALL_ARCHITECTURES
-       $(AM_V_GEN)sed -i '' -e '/^SystemCallArchitectures/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^SystemCallArchitectures/' $@
 endif
 if !HAVE_SYSTEMD_SYSTEM_CALL_FILTER
-       $(AM_V_GEN)sed -i '' -e '/^SystemCallFilter/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^SystemCallFilter/' $@
 endif
 
 dnsdist@.service: dnsdist.service

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 9dfd6dbb05f859d6749e34ba8f36d7db0aa0a517..92c8ae5a27ed0b0eb3ae11fd64c662c64771f1e7 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -451,43 +451,43 @@ if HAVE_SYSTEMD
 pdns-recursor.service: pdns-recursor.service.in
        $(AM_V_GEN)sed -e 's![@]sbindir[@]!$(sbindir)!' < $< > $@
 if !HAVE_SYSTEMD_LOCK_PERSONALITY
-       $(AM_V_GEN)sed -i '' -e '/^LockPersonality/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^LockPersonality/' $@
 endif
 if !HAVE_SYSTEMD_PRIVATE_DEVICES
-       $(AM_V_GEN)sed -i '' -e '/^PrivateDevices/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^PrivateDevices/' $@
 endif
 if !HAVE_SYSTEMD_PRIVATE_TMP
-       $(AM_V_GEN)sed -i '' -e '/^PrivateTmp/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^PrivateTmp/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_CONTROL_GROUPS
-       $(AM_V_GEN)sed -i '' -e '/^ProtectControlGroups/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectControlGroups/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_HOME
-       $(AM_V_GEN)sed -i '' -e '/^ProtectHome/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectHome/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_KERNEL_MODULES
-       $(AM_V_GEN)sed -i '' -e '/^ProtectKernelModules/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectKernelModules/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_KERNEL_TUNABLES
-       $(AM_V_GEN)sed -i '' -e '/^ProtectKernelTunables/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectKernelTunables/' $@
 endif
 if !HAVE_SYSTEMD_PROTECT_SYSTEM
-       $(AM_V_GEN)sed -i '' -e '/^ProtectSystem/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^ProtectSystem/' $@
 endif
 if !HAVE_SYSTEMD_RESTRICT_ADDRESS_FAMILIES
-       $(AM_V_GEN)sed -i '' -e '/^RestrictAddressFamilies/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^RestrictAddressFamilies/' $@
 endif
 if !HAVE_SYSTEMD_RESTRICT_NAMESPACES
-       $(AM_V_GEN)sed -i '' -e '/^RestrictNamespaces/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^RestrictNamespaces/' $@
 endif
 if !HAVE_SYSTEMD_RESTRICT_REALTIME
-       $(AM_V_GEN)sed -i '' -e '/^RestrictRealtime/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^RestrictRealtime/' $@
 endif
 if !HAVE_SYSTEMD_SYSTEM_CALL_ARCHITECTURES
-       $(AM_V_GEN)sed -i '' -e '/^SystemCallArchitectures/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^SystemCallArchitectures/' $@
 endif
 if !HAVE_SYSTEMD_SYSTEM_CALL_FILTER
-       $(AM_V_GEN)sed -i '' -e '/^SystemCallFilter/d' $@
+       $(AM_V_GEN)perl -ni -e 'print unless /^SystemCallFilter/' $@
 endif
 
 pdns-recursor@.service: pdns-recursor.service