From 9318ebc5a59e237628457e379d7be3ece5f8d704 Mon Sep 17 00:00:00 2001 From: Daouda Lo Date: Fri, 9 Jul 2004 10:33:56 +0000 Subject: rewrite big chunks of code, added mdkonline.pm --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1f1e0b6b..c4760627 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PACKAGE = mdkonline -VERSION:=$(shell rpm -q --qf %{VERSION} --specfile $(PACKAGE).spec) -RELEASE:=$(shell rpm -q --qf %{RELEASE} --specfile $(PACKAGE).spec) +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 -- '-.' '__') NAME = mdkonline @@ -14,6 +14,7 @@ ICONSDIR = $(DATADIR)/icons PIXDIR = $(DATADIR)/$(NAME) SBINDIR = $(PREFIX)/usr/sbin BINDIR = $(PREFIX)/usr/bin +FBLIBDIR = $(PREFIX)/usr/lib/libDrakX/drakfirsttime SYSCONFDIR = $(PREFIX)/etc/sysconfig SBINREL = ../sbin @@ -32,7 +33,7 @@ clean: install: all $(MAKE) -C po $@ - install -d $(PREFIX)/usr/{sbin,bin,share/{$(NAME)/pixmaps,autostart,icons/{mini,large}}} + install -d $(PREFIX)/usr/{sbin,bin,share/{$(NAME)/pixmaps,autostart,icons/{mini,large}},lib/libDrakX/drakfirsttime} install -m755 $(NAME) $(SBINDIR) install -m755 $(MDKUPDATE) $(SBINDIR) install -m755 $(MDKAPPLET) $(BINDIR) @@ -41,6 +42,7 @@ install: all install -m644 icons/$(NAME)48.png $(ICONSDIR)/large/$(NAME).png install -m644 pixmaps/*.png $(PIXDIR)/pixmaps install -m644 mdkapplet.desktop $(PREFIX)/usr/share/autostart/ + install -m644 mdkonline.pm $(FBLIBDIR) for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done # rules to build a test rpm -- cgit v1.2.1