From e0ada251ac68dc91192c7ec7d10f3a1d7784916a Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Sat, 14 May 2011 01:22:07 +0100 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Mageia. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r1310 | dmorgan | 2011-05-14 01:22:07 +0100 (Sat, 14 May 2011) | 1 line Import cleaned mgaonline ------------------------------------------------------------------------ --- Makefile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 892ac9c7..63ff8244 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -PACKAGE = mdkonline -VERSION:=2.77.21 +PACKAGE = mgaonline +VERSION:=2.77.22 SVNROOT = svn+ssh://svn.mandriva.com/svn/soft/$(PACKAGE) -NAME = mdkonline -MDKUPDATE = mdkupdate -MDKAPPLET = mdkapplet +NAME = mgaonline +MGAUPDATE = mgaupdate +MGAAPPLET = mgaapplet SUBDIRS = po MANDRIVA_VERSION = $(shell awk 'BEGIN { RS=","; FS="=" } $$1 == "version" { print $$2 }' /etc/product.id) @@ -24,7 +24,7 @@ localedir = $(PREFIX)/usr/share/locale override CFLAGS += -DPACKAGE=\"$(NAME)\" -DLOCALEDIR=\"$(localedir)\" all: - (find -name .svn -prune -name '*.pm' -o -name mdkapplet\* -o -name mdkupdate -o -name mdvonline_agent.pl -type f) | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g' + (find -name .svn -prune -name '*.pm' -o -name mgaapplet\* -o -name mgaupdate -o -name mgaonline_agent.pl -type f) | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g' for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done clean: @@ -35,29 +35,29 @@ clean: install: all install -d $(PREFIX)/usr/{sbin,bin,share/{mime/packages,$(NAME)/pixmaps,autostart,gnome/autostart,icons/{mini,large}},lib/libDrakX/drakfirsttime} - install -m755 $(MDKUPDATE) $(SBINDIR) - install -m755 $(MDKAPPLET) $(BINDIR) + install -m755 $(MGAUPDATE) $(SBINDIR) + install -m755 $(MGAAPPLET) $(BINDIR) install -d $(SYSCONFDIR) - install -m644 mdkapplet.conf $(SYSCONFDIR)/mdkapplet + install -m644 mgaapplet.conf $(SYSCONFDIR)/mgaapplet install -m644 icons/$(NAME)16.png $(ICONSDIR)/mini/$(NAME).png install -m644 icons/$(NAME)32.png $(ICONSDIR)/$(NAME).png install -m644 icons/$(NAME)48.png $(ICONSDIR)/large/$(NAME).png install -m644 pixmaps/*.png $(PIXDIR)/pixmaps - perl -pi -e "s/version = 1/version = '$(VERSION)'/" mdkonline.pm - install -m644 mdkonline.pm $(FBLIBDIR) - install -m644 mdkapplet_gui.pm $(FBLIBDIR) - install -m644 mdkapplet_urpm.pm $(FBLIBDIR) + perl -pi -e "s/version = 1/version = '$(VERSION)'/" mgaonline.pm + install -m644 mgaonline.pm $(FBLIBDIR) + install -m644 mgaapplet_gui.pm $(FBLIBDIR) + install -m644 mgaapplet_urpm.pm $(FBLIBDIR) for d in $(SUBDIRS); do make -C $$d $@; done # mime - install -m644 mdkonline.xml $(DATADIR)/mime/packages/mdkonline.xml + install -m644 mgaonline.xml $(DATADIR)/mime/packages/mgaonline.xml mkdir -p $(DATADIR)/mimelnk/application/ - install -m644 x-mdv-exec.desktop $(DATADIR)/mimelnk/application/ + install -m644 x-mga-exec.desktop $(DATADIR)/mimelnk/application/ mkdir -p $(PREFIX)/etc/security/console.apps/ install -m644 console.apps_urpmi.update $(PREFIX)/etc/security/console.apps/urpmi.update mkdir -p $(PREFIX)/etc/pam.d install -m644 pam.d_urpmi.update $(PREFIX)/etc/pam.d/urpmi.update ln -sf consolehelper $(PREFIX)/usr/bin/urpmi.update - for i in mdkapplet-config mdkapplet-add-media-helper mdkapplet-upgrade-helper; do \ + for i in mgaapplet-config mgaapplet-add-media-helper mgaapplet-upgrade-helper; do \ install -m755 $$i $(SBINDIR); \ ln -sf consolehelper $(PREFIX)/usr/bin/$$i; \ done -- cgit v1.2.1