openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: fix make clean target

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-03-04 17:46:55 +01:00
parent 90ac66435c
commit 574225f2cf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -14,6 +14,10 @@ Changes in version 1.9.3
/usr/bin/pck-update: line 2458: package: command not found /usr/bin/pck-update: line 2458: package: command not found
(Problem pointed out by Silvan Calarco.) (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 Changes in version 1.9.2

7
Makefile
View File

@ -31,6 +31,7 @@ dist_archive = $(distdir).tar.bz2
DESTDIR = DESTDIR =
pck_conf = $(PACKAGE).conf pck_conf = $(PACKAGE).conf
pck_root := $(sort $(patsubst %.in,%,$(wildcard *.in)))
pck_libs := $(sort $(patsubst %.in,%,$(wildcard lib/*))) pck_libs := $(sort $(patsubst %.in,%,$(wildcard lib/*)))
pck_manpages := $(patsubst %.in,%,$(wildcard man/*.in man/*/*.in)) pck_manpages := $(patsubst %.in,%,$(wildcard man/*.in man/*/*.in))
pck_plugins := $(sort $(patsubst %.in,%,$(wildcard plugins/*))) pck_plugins := $(sort $(patsubst %.in,%,$(wildcard plugins/*)))
@ -168,7 +169,6 @@ dist: clean
bzip2 -9 -c > history/$(dist_archive) bzip2 -9 -c > history/$(dist_archive)
dist-rpm: dist $(PACKAGE).spec dist-rpm: dist $(PACKAGE).spec
@echo "Creating rpm and srpm packages..."
@rpm_name=$(PACKAGE)-$(VERSION)-$(RELEASE);\ @rpm_name=$(PACKAGE)-$(VERSION)-$(RELEASE);\
rpm_sourcedir=`rpm --eval=%{_sourcedir} 2>/dev/null`;\ rpm_sourcedir=`rpm --eval=%{_sourcedir} 2>/dev/null`;\
rpm_specdir=`rpm --eval=%{_specdir} 2>/dev/null`;\ rpm_specdir=`rpm --eval=%{_specdir} 2>/dev/null`;\
@ -176,9 +176,11 @@ dist-rpm: dist $(PACKAGE).spec
[ -d "$$d" ] || \ [ -d "$$d" ] || \
{ echo "not found: $$d" 1>&2; exit 1; };\ { echo "not found: $$d" 1>&2; exit 1; };\
done;\ done;\
echo "Copying $(dist_archive) to $$rpm_sourcedir...";\
(cp -p history/$(dist_archive) $$rpm_sourcedir &&\ (cp -p history/$(dist_archive) $$rpm_sourcedir &&\
mv -f $(PACKAGE).spec $$rpm_specdir &&\ 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)..." @echo "All done. Enjoy using $(PACKAGE)..."
dist-rpm-install: dist-rpm dist-rpm-install: dist-rpm
@ -193,6 +195,7 @@ clean: mostlyclean
mostlyclean: mostlyclean:
@echo "Cleaning up unpackaged files..." @echo "Cleaning up unpackaged files..."
@rm -f $(pck_root)
@$(MAKE) clean -C lib || exit 1 @$(MAKE) clean -C lib || exit 1
@$(MAKE) clean -C plugins || exit 1 @$(MAKE) clean -C plugins || exit 1
@$(MAKE) clean -C templates || exit 1 @$(MAKE) clean -C templates || exit 1