From 85a5c574a598b623a177c1214e57b1448258cb44 Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" Date: Mon, 25 Sep 2017 15:00:51 -0700 Subject: [PATCH] flux.service: Fix EXTRA_DIST and .gitignore Add flux.service .gitignore, since it is generated from flux.service.in at configure time. Remove the EXTRA_DIST of flux.service. Since this is generated at configure time from flux.service.in and flux.service.in is already part of the dist by way of being declared in AC_CONFIG_FILES, it does not appear that flux.service should be EXTRA_DIST. --- etc/.gitignore | 2 ++ etc/Makefile.am | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/.gitignore b/etc/.gitignore index bb50b0ec175c..a69ae7a49775 100644 --- a/etc/.gitignore +++ b/etc/.gitignore @@ -1 +1,3 @@ /flux +/flux.service + diff --git a/etc/Makefile.am b/etc/Makefile.am index f6ad04cc96f3..7fd25c091924 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -34,5 +34,4 @@ pkgconfig_DATA = flux-core.pc flux-pmi.pc flux-optparse.pc endif EXTRA_DIST = \ - gen-cmdhelp.pl \ - flux.service + gen-cmdhelp.pl