From 905c36d392902ace328545215a3a559b4db98ef8 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@mandriva.com>
Date: Tue, 20 Feb 2007 17:15:50 +0000
Subject: -Clean Makefile to be SVN compliant -remove obsolete .desktop file
 -remove specfile, moved to another location

---
 Makefile | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index cbfb41b9..ba6e62fc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ PACKAGE = mdkonline
 VERSION:=$(shell rpm -q --qf '%{VERSION}\n' --specfile $(PACKAGE).spec|head -n 1)
 RELEASE:=$(shell rpm -q --qf '%{RELEASE}\n' --specfile $(PACKAGE).spec|head -n 1)
 TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
+SVNROOT = svn+ssh://svn.mandriva.com/svn/soft/$(PACKAGE)
 
 NAME = mdkonline
 MDKUPDATE = mdkupdate
@@ -33,7 +34,7 @@ clean:
 
 install: all
 	$(MAKE) -C po $@
-	install -d $(PREFIX)/usr/{sbin,bin,share/{mime/packages,$(NAME)/pixmaps,autostart,icons/{mini,large}},lib/libDrakX/drakfirsttime}
+	install -d $(PREFIX)/usr/{sbin,bin,share/{mime/packages,$(NAME)/pixmaps,autostart,gnome/autostart,icons/{mini,large}},lib/libDrakX/drakfirsttime}
 	install -m755 $(NAME) $(SBINDIR)
 	install -m755 $(MDKUPDATE) $(SBINDIR)
 	install -m755 $(MDKAPPLET) $(BINDIR)
@@ -43,12 +44,8 @@ install: all
 	install -m644 icons/$(NAME)48.png $(ICONSDIR)/large/$(NAME).png
 	install -m644 pixmaps/*.png $(PIXDIR)/pixmaps
 	install -m644 mdkonline.xml $(DATADIR)/mime/packages/mdkonline.xml
-#	install -m644 mdkapplet.desktop $(PREFIX)/usr/share/autostart/
 	install -m644 mdkonline.pm $(FBLIBDIR)
 	for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
-# menu entry:
-	mkdir -p $(DATADIR)/applications/
-	install -m644 mdkonline.desktop $(DATADIR)/applications/
 # mime
 	mkdir -p $(DATADIR)/mimelnk/applications/
 	install -m644 x-mdv-exec.desktop $(DATADIR)/mimelnk/applications/
@@ -86,18 +83,20 @@ buildsrpm:
 
 # rules to build a distributable rpm
 
-rpm: changelog cvstag dist buildrpm
+rpm: changelog svntag dist buildrpm
 
-dist: cleandist dir export tar
+dist: cleandist export tar
 
-export:
-	cvs export -d $(PACKAGE)-$(VERSION) -r $(TAG) $(PACKAGE)
+export: 
+	svn export $(SVNROOT)/tags/$(TAG) $(PACKAGE)-$(VERSION)
 
-cvstag:
-	cvs tag $(CVSTAGOPT) $(TAG)
+svntag: 
+	svn copy $(SVNROOT)/trunk $(SVNROOT)/tags/$(TAG) -m "$(TAG)"
+
+log:changelog
 
-log: changelog
 changelog: ../common/username
+#svn2cl is available in our contrib.
 	svn2cl --authors ../common/username.xml --accum
 	rm -f ChangeLog.bak
-	svn commit -m "Generated by cvs2cl the `date '+%d_%b'`" ChangeLog
+	svn commit -m "Generated by svn2cl the `date '+%c'`" ChangeLog
-- 
cgit v1.2.1