From bf71ff3b821a5ac679a8817df78bf52b8aff3013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?=
 <mmaslano@fedoraproject.org>
Date: Wed, 28 Feb 2007 14:03:02 +0000
Subject: [PATCH] Update for merge review.

---
 groff.spec | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/groff.spec b/groff.spec
index b079b17..4bc535e 100644
--- a/groff.spec
+++ b/groff.spec
@@ -121,11 +121,27 @@ xmkmf && make
 rm -rf ${RPM_BUILD_ROOT}
 #PATH=$PATH:%{_prefix}/X11R6/bin
 mkdir -p ${RPM_BUILD_ROOT}%{_prefix} ${RPM_BUILD_ROOT}%{_infodir}
-%makeinstall manroot=${RPM_BUILD_ROOT}/%{_mandir}
+make install manroot=${RPM_BUILD_ROOT}%{_mandir} \
+			bindir=%{buildroot}%{_bindir} \
+			mandir=%{buildroot}%{_mandir} \
+			prefix=%{buildroot}/usr \
+			exec_prefix=%{buildroot}/usr \
+			sbindir=%{buildroot}%{_exec_prefix}/sbin \
+			sysconfdir=%{buildroot}/etc \
+			datadir=%{buildroot}/usr/share \
+			infodir=%{buildroot}/%{_prefix}/info \
+			sysconfdir=%{buildroot}/etc \
+			includedir=%{buildroot}/usr/include \
+			libdir=%{buildroot}/%{_libdir} \
+			libexecdir=%{buildroot}/usr/libexec \
+			localstatedir=%{buildroot}/var \
+			sharedstatedir=%{buildroot}/usr/com \
+			infodir=%{buildroot}/usr/share/info
+			
 #install -m 644 doc/groff.info* ${RPM_BUILD_ROOT}/%{_infodir}
 %if %{with_x}
 cd src/xditview
-%makeinstall DESTDIR=${RPM_BUILD_ROOT}
+make install DESTDIR=${RPM_BUILD_ROOT}
 cd ../..
 %endif
 #mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_prefix}/share
@@ -175,8 +191,11 @@ ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac
 # installed, but not packaged in rpm
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/groffer/
 mv $RPM_BUILD_ROOT%{_libdir}/groff/groffer/* $RPM_BUILD_ROOT/%{_datadir}/groff/%{version}/groffer/
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_libdir}/X11/app-defaults \
-	$RPM_BUILD_ROOT%{_libdir}/groff/groffer
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_libdir}/X11/app-defaults
+rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/groffer
+rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/site-tmac
+rm -rf $RPM_BUILD_ROOT%{_libdir}/groff
+rm -rf $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -197,7 +216,6 @@ exit 0
 %doc	doc/meintro.me doc/meref.me doc/pic.ms
 %{_datadir}/groff
 %{_infodir}/groff*
-%{_libdir}/groff
 %attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devps/generate/afmname
 %attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devps/generate/symbol.sed
 %attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devdvi/generate/CompileFonts