rpms/z88dk/devel z88dk-1.8-makefile-usr-share.patch, 1.1, 1.2 z88dk.spec, 1.15, 1.16

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7336/devel

Modified Files:
	z88dk-1.8-makefile-usr-share.patch z88dk.spec 
Log Message:
- use DESTDIR instead of makeinstall macro (fixes buildroot in .cfg files)

z88dk-1.8-makefile-usr-share.patch:

Index: z88dk-1.8-makefile-usr-share.patch
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk-1.8-makefile-usr-share.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- z88dk-1.8-makefile-usr-share.patch	10 Mar 2008 23:47:56 -0000	1.1
+++ z88dk-1.8-makefile-usr-share.patch	11 Mar 2008 00:30:03 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur z88dk/Makefile z88dk-makefile-usr-share/Makefile
 --- z88dk/Makefile	2008-03-01 16:06:51.000000000 +0100
-+++ z88dk-makefile-usr-share/Makefile	2008-03-11 00:45:08.000000000 +0100
++++ z88dk-makefile-usr-share/Makefile	2008-03-11 01:27:29.000000000 +0100
 @@ -7,7 +7,7 @@
  
  # ---> Configurable parameters are below his point
@@ -26,9 +26,9 @@
 -	mkdir -p $(prefix)/lib/z88dk/lib/clibs
 -	cp -R lib/clibs/* $(prefix)/lib/z88dk/lib/clibs/
 -	find $(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644
-+	mkdir -p $(prefix_share)/z88dk/lib/clibs
-+	cp -R lib/clibs/* $(prefix_share)/z88dk/lib/clibs/
-+	find $(prefix_share)/z88dk/lib/clibs -type f | xargs chmod 644
++	mkdir -p $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs
++	cp -R lib/clibs/* $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs/
++	find $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs -type f | xargs chmod 644
  
  
  install:


Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- z88dk.spec	11 Mar 2008 00:11:24 -0000	1.15
+++ z88dk.spec	11 Mar 2008 00:30:03 -0000	1.16
@@ -19,6 +19,7 @@
 %prep
 %setup -q -n z88dk
 # Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk
+# Also support DESTDIR in install-libs
 %patch0 -p1
 # Lots of buggy makefiles there
 %patch1 -p1
@@ -51,7 +52,7 @@
 export ZCCCFG=%{_datadir}/z88dk-%{version}/lib/config/
 %{__rm} -rf %{buildroot}
 %{__mkdir} %{buildroot}
-%{makeinstall} install-libs
+%{__make} install install-libs DESTDIR=%{buildroot}
 %{__mkdir_p} %{buildroot}%{_mandir}/man3z
 %{__cp} -p netman/man3z/* %{buildroot}%{_mandir}/man3z
 
@@ -81,6 +82,7 @@
 - update makefile-fixes patch (most issues fixed upstream, only one left)
 - update z88make.patch and rename to z88dk-1.8-makefile-usr-share.patch
 - remove redundant sed (already covered by above patch)
+- use DESTDIR instead of makeinstall macro (fixes buildroot in .cfg files)
 
 * Sat Feb 9 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.7-3
 - rebuild for GCC 4.3