From 1516c813ffe15c257fe3d013d380c268b458a5ba Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 12 Jul 2006 18:21:18 +0000
Subject: use dis target

---
 Makefile | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8f7850d..3fa710a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
+NAME = ldetect
 LIB_MAJOR = 0.6
 LIB_MINOR = 0
+VERSION=$(LIB_MAJOR).$(LIB_MINOR)
 
-project = ldetect
 prefix = /usr
 bindir = $(prefix)/bin
 libdir = $(prefix)/lib
@@ -49,12 +50,19 @@ install: build
 	cp -a $(libraries) $(libdir)
 	install libldetect.h $(includedir)
 
-rpm: srpm
-	rpm -bb --clean --rmsource --rmspec $(project).spec
+dis ../$(NAME)-$(VERSION).tar.bz2: clean
+	rm -rf $(NAME)-$(VERSION)
+	mkdir -p $(NAME)-$(VERSION)
+	find -not -name $(NAME)-$(VERSION) | cpio -pd $(NAME)-$(VERSION)/
+	find $(NAME)-$(VERSION) -type d -name .svn | xargs rm -rf
+	tar cfj ../$(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)
+	rm -rf $(NAME)-$(VERSION)
 
-srpm: clean $(RPM)
-	(cd .. ; tar cfj $(RPM)/SOURCES/$(project).tar.bz2 $(project))
-	rpm -bs $(RPM)/SPECS/$(project).spec
+rpm: dis $(RPM)
+	rpm -ta ../$(NAME)-$(VERSION).tar.bz2
+
+srpm: dis $(RPM)
+	rpm -ts ../$(NAME)-$(VERSION).tar.bz2
 
 log:
 	cvs2cl -U ../common/username -I ChangeLog -W 400 --accum
-- 
cgit v1.2.1