summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmove.sh6
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-server.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-transaction.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c2
4 files changed, 7 insertions, 5 deletions
diff --git a/move.sh b/move.sh
index 136e991556..b817974ecf 100755
--- a/move.sh
+++ b/move.sh
@@ -255,8 +255,10 @@ breakup_makefile() (
fixup_includes() (
find src \( -name '*.h' -o -name '*.c' \) \
- -exec grep '#include "sd-' -l -- {} + |
- xargs -d $'\n' sed -ri 's|#include "(sd-[^"]*)"|#include <systemd/\1>|'
+ -exec grep '#include ["<]sd-' -l -- {} + |
+ xargs -d $'\n' sed -ri \
+ -e 's|#include "(sd-[^"]*)"|#include <systemd/\1>|' \
+ -e 's|#include <(sd-[^>]*)>|#include <systemd/\1>|'
)
fixup_makefile() {
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-server.c b/src/grp-resolve/systemd-resolved/resolved-dns-server.c
index 3095c042db..dedc9beb19 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-server.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-server.c
@@ -17,7 +17,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sd-messages.h>
+#include <systemd/sd-messages.h>
#include "alloc-util.h"
#include "resolved-dns-server.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
index a4a67623e7..1b4b2b804b 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
@@ -17,7 +17,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sd-messages.h>
+#include <systemd/sd-messages.h>
#include "af-list.h"
#include "alloc-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
index 77370e7dd5..0972792341 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
@@ -17,7 +17,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sd-messages.h>
+#include <systemd/sd-messages.h>
#include "alloc-util.h"
#include "conf-files.h"