From 574225f2cfdafc5c10a5da82019035a517675f13 Mon Sep 17 00:00:00 2001
From: Davide Madrisan <davide.madrisan@gmail.com>
Date: Sun, 4 Mar 2012 17:46:55 +0100
Subject: [PATCH] Makefile: fix make clean target

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
---
 ChangeLog | 4 ++++
 Makefile  | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29c0043..21231a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,10 @@ Changes in version 1.9.3
     /usr/bin/pck-update: line 2458: package: command not found
     (Problem pointed out by Silvan Calarco.)
 
+  * Makefile - Davide Madrisan:
+    Fix make clean target: the files in the root directory generated from .in
+    files must be removed too.
+
 --------------------------------------------------------------------------------
 
 Changes in version 1.9.2
diff --git a/Makefile b/Makefile
index 6ce2797..8d3cfd8 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ dist_archive = $(distdir).tar.bz2
 DESTDIR =
 
 pck_conf = $(PACKAGE).conf
+pck_root := $(sort $(patsubst %.in,%,$(wildcard *.in)))
 pck_libs := $(sort $(patsubst %.in,%,$(wildcard lib/*)))
 pck_manpages := $(patsubst %.in,%,$(wildcard man/*.in man/*/*.in))
 pck_plugins := $(sort $(patsubst %.in,%,$(wildcard plugins/*)))
@@ -168,7 +169,6 @@ dist: clean
 	   bzip2 -9 -c > history/$(dist_archive)
 
 dist-rpm: dist $(PACKAGE).spec
-	@echo "Creating rpm and srpm packages..."
 	@rpm_name=$(PACKAGE)-$(VERSION)-$(RELEASE);\
 	rpm_sourcedir=`rpm --eval=%{_sourcedir} 2>/dev/null`;\
 	rpm_specdir=`rpm --eval=%{_specdir} 2>/dev/null`;\
@@ -176,9 +176,11 @@ dist-rpm: dist $(PACKAGE).spec
 	   [ -d "$$d" ] || \
 	    { echo "not found: $$d" 1>&2; exit 1; };\
 	done;\
+	echo "Copying $(dist_archive) to $$rpm_sourcedir...";\
 	(cp -p history/$(dist_archive) $$rpm_sourcedir &&\
 	 mv -f $(PACKAGE).spec $$rpm_specdir &&\
-	 rpmbuild --clean -ba $$rpm_specdir/$(PACKAGE).spec) || exit 1
+	echo "Creating rpm and srpm packages..." &&\
+	rpmbuild --clean -ba $$rpm_specdir/$(PACKAGE).spec) || exit 1
 	@echo "All done. Enjoy using $(PACKAGE)..."
 
 dist-rpm-install: dist-rpm
@@ -193,6 +195,7 @@ clean: mostlyclean
 
 mostlyclean:
 	@echo "Cleaning up unpackaged files..."
+	@rm -f $(pck_root)
 	@$(MAKE) clean -C lib || exit 1
 	@$(MAKE) clean -C plugins || exit 1
 	@$(MAKE) clean -C templates || exit 1