[parted-devel] 01-parted.spec-rule-normalize

[Jim Meyering]

Here's a tiny fix-up patch.  No big deal.
Just making things work a little more like they're supposed to.

Normalize the way we handle a generated-and-distributed file, parted.spec.

From: Jim Meyering <jim at meyering.net>

* Makefile.am (EXTRA_DIST): Add parted.spec.
(parted.spec): New rule.
(MAINTAINERCLEANFILES): Add parted.spec.
* configure.ac (AC_OUTPUT): Remove parted.spec from the list.
---

 Makefile.am  |   43 +++++++++++++++++++++++++------------------
 configure.ac |    1 -
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ae5dd8c..15dacb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ EXTRA_DIST = \
              BUGS                                  \
 	     libparted.pc.in			   \
              parted.spec.in                        \
+             parted.spec                           \
              scripts/data/abi/baseline_symbols.txt \
              scripts/extract_symvers
 
@@ -13,8 +14,13 @@ aclocaldir=$(datadir)/aclocal
 pcdir = $(libdir)/pkgconfig
 pc_DATA = libparted.pc.in
 
-dist-hook: parted.spec
-	cp parted.spec $(distdir)
+# This is best not done via configure.ac, because automake's
+# make distcheck target does not like auto-generated files
+# being included in the distributed archive.
+parted.spec: parted.spec.in
+	sed 's/@''PACKAGE@/@PACKAGE@/;s/@''VERSION@/@VERSION@/' $< > $@-tmp
+	mv $@-tmp $@
+MAINTAINERCLEANFILES = parted.spec
 
 ### ABI Checking scripts ###
 
@@ -53,19 +59,20 @@ check-abi: baseline_symbols current_symbols.txt
 
 MOSTLYCLEANDIRS = m4
 
-MAINTAINERCLEANFILES = ABOUT-NLS     \
-                       ChangeLog     \
-                       INSTALL       \
-                       Makefile.in   \
-                       aclocal.m4    \
-                       compile       \
-                       config.guess  \
-                       config.h.in   \
-                       config.rpath  \
-                       config.sub    \
-                       configure     \
-                       depcomp       \
-                       install-sh    \
-                       ltmain.sh     \
-                       missing       \
-                       mkinstalldirs
+MAINTAINERCLEANFILES += \
+  ABOUT-NLS     \
+  ChangeLog     \
+  INSTALL       \
+  Makefile.in   \
+  aclocal.m4    \
+  compile       \
+  config.guess  \
+  config.h.in   \
+  config.rpath  \
+  config.sub    \
+  configure     \
+  depcomp       \
+  install-sh    \
+  ltmain.sh     \
+  missing       \
+  mkinstalldirs
diff --git a/configure.ac b/configure.ac
index 5d65ead..17ca11b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -503,7 +503,6 @@ debug/Makefile
 debug/clearfat/Makefile
 debug/test/Makefile
 po/Makefile.in
-parted.spec
 ])
 
 echo