aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile5
-rw-r--r--mandrake_desk.spec9
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fed46c9..e886dbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-22 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+
+ * Makefile: Add mandir to be BM compliant.
+
2000-07-18 Chmouel Boudjnah <chmouel@mandrakesoft.com>
* sbin/chksession: Set support for KDE2 by default when generating
diff --git a/Makefile b/Makefile
index 270116c..b89662c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
NAME = mandrake_desk
VERSION = $(shell awk '/define version/ { print $$3 }' $(NAME).spec)
+mandir=/usr/share/man
all:
@echo "Run make install"
@@ -9,7 +10,7 @@ clean:
install:
mkdir -p $(RPM_BUILD_ROOT)/usr/{s,}bin
- mkdir -p $(RPM_BUILD_ROOT)/usr/man/man8/
+ mkdir -p $(RPM_BUILD_ROOT)/$(mandir)/man8/
mkdir -p $(RPM_BUILD_ROOT)/usr/lib/mc/
mkdir -p $(RPM_BUILD_ROOT)/usr/share/{icons,icons/large,icons/mini,pixmaps/backgrounds/mandrake}
mkdir -p $(RPM_BUILD_ROOT)/etc/X11/
@@ -19,7 +20,7 @@ install:
mkdir -p $(RPM_BUILD_ROOT)/usr/lib/desktop-links
mkdir -p $(RPM_BUILD_ROOT)/usr/share/gnome/apps/Internet
mkdir -p $(RPM_BUILD_ROOT)/usr/share/gnome/apps/System
- install -m644 man/*8 $(RPM_BUILD_ROOT)/usr/man/man8/
+ install -m644 man/*8 $(RPM_BUILD_ROOT)/$(mandir)/man8/
install -m755 sbin/* $(RPM_BUILD_ROOT)/usr/sbin/
install -m755 bin/* $(RPM_BUILD_ROOT)/usr/bin/
install -m644 icons/*.xpm $(RPM_BUILD_ROOT)/usr/share/icons/
diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 95b9512..e9bf51a 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -1,6 +1,6 @@
%define name mandrake_desk
%define version 1.0.4
-%define release 4mdk
+%define release 5mdk
Summary: The Desktop configuration files for Linux Mandrake
Name: %{name}
@@ -27,7 +27,7 @@ rm -rf $RPM_BUILD_ROOT
%build
%install
-make install RPM_BUILD_ROOT=$RPM_BUILD_ROOT
+make install RPM_BUILD_ROOT=$RPM_BUILD_ROOT mandir=%{_mandir}
mkdir -p $RPM_BUILD_ROOT/etc/X11/wmsession.d/
rm -f special/mandrake-small.xpm
@@ -57,9 +57,12 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/gnome/apps/System/*.desktop
/usr/lib/mc/desktop-scripts/mandrake.links.sh
/usr/lib/desktop-links/mandrake.links
-/usr/man/*/*
+%{_mandir}/*/*
%changelog
+* Sat Jul 22 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 1.0.4-5mdk
+- Oups forgot the BM.
+
* Tue Jul 18 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 1.0.4-4mdk
- sbin/chksession: Set support for KDE2 by default when generating
session.