summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-05-10 18:15:40 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2017-05-10 18:15:40 -0400
commitff6514f056098c885323e8629d6ac6d113796f35 (patch)
treee3afb71d9bd7f0f10c6c3b3050dc4b4cdf18b62d
parent28420561826df73fff80c4a3c808aa9f1d418730 (diff)
location of import-pubring.gpg
-rw-r--r--Makefile.am3
-rwxr-xr-xtools/notsd-move7
2 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index f032bfa65f..aeebb59732 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5493,10 +5493,11 @@ systemd_export_LDADD = \
$(ZLIB_LIBS) \
$(BZIP2_LIBS)
-#@auto/systemd-importd/Makefile
+#@auto/systemd-pull/Makefile
dist_rootlibexec_DATA += \
src/import/import-pubring.gpg
+#@auto/systemd-importd/Makefile
nodist_systemunit_DATA += \
units/systemd-importd.service
diff --git a/tools/notsd-move b/tools/notsd-move
index 30f63d354f..4c4c916701 100755
--- a/tools/notsd-move
+++ b/tools/notsd-move
@@ -205,13 +205,14 @@ move_files() (
src/import/.gitignore \
src/import/importd.c \
src/import/org.*
- mkdir src/systemd-import
- mv -t src/systemd-import \
- src/import/import*
mkdir src/systemd-pull
mv -t src/systemd-pull \
+ src/import/import-pubring.gpg \
src/import/pull* \
src/import/curl-util*
+ mkdir src/systemd-import
+ mv -t src/systemd-import \
+ src/import/import*
rmdir src/import
# src/journal => src/...