rpms/z88dk/devel z88dk-1.8-makefile-usr-share.patch, NONE, 1.1 z88dk.spec, 1.13, 1.14 z88make.patch, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	z88dk.spec 
Added Files:
	z88dk-1.8-makefile-usr-share.patch 
Removed Files:
	z88make.patch 
Log Message:
- update z88make.patch and rename to z88dk-1.8-makefile-usr-share.patch
- remove redundant sed (already covered by above patch)

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

--- NEW FILE z88dk-1.8-makefile-usr-share.patch ---
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
@@ -7,7 +7,7 @@
 
 # ---> Configurable parameters are below his point
 
-prefix = /usr/local
+prefix = /usr
 prefix_share = $(prefix)/share
 
 # The default machine, the lib/config/DEFAULT.cfg file is copied to zcc.cfg
@@ -51,7 +51,7 @@
 
 
 setup:
-	echo '#define PREFIX "${prefix}$"/lib/z88dk"' > src/config.h
+	echo '#define PREFIX "'$(prefix_share)'/z88dk"' > src/config.h
 	echo '#define UNIX 1' >> src/config.h
 
 appmake:
@@ -87,9 +87,9 @@
 	cd libsrc ; $(MAKE) install
 
 install-libs:
-	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
 
 
 install:


Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- z88dk.spec	10 Mar 2008 23:13:46 -0000	1.13
+++ z88dk.spec	10 Mar 2008 23:47:56 -0000	1.14
@@ -5,7 +5,7 @@
 License: Artistic clarified
 Group: Development/Tools
 Source: http://downloads.sourceforge.net/z88dk/z88dk-src-%{version}.tgz
-Patch0: z88make.patch
+Patch0: z88dk-1.8-makefile-usr-share.patch
 Patch1: z88dk-1.8-makefile-fixes.patch
 Patch2: z88dk-1.7-64bit.patch
 URL: http://z88dk.sourceforge.net/
@@ -18,6 +18,7 @@
 
 %prep
 %setup -q -n z88dk
+# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk
 %patch0 -p0
 # Lots of buggy makefiles there
 %patch1 -p1
@@ -27,9 +28,6 @@
 # Separate manpages from other docs and fix their permissions
 %{__mv} doc/netman .
 %{__chmod} 644 netman/man3z/*
-# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk
-%{__sed} -i -e 's@[$][(]prefix[)]/lib/z88dk@$(datadir)/z88dk at g' \
-	    -e 's@[$][{]prefix[}][$]/lib/z88dk@%{_datadir}/z88dk at g' Makefile
 # Fix files with wrong line endings and bad permissions
 /usr/bin/find doc examples src -type f -exec %{__sed} -i -e 's/\r*$//' {} \;
 /usr/bin/find doc examples src -type f -exec %{__chmod} 644 {} \;
@@ -81,6 +79,8 @@
 * Mon Mar 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.8-1
 - update to 1.8
 - 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)
 
 * Sat Feb 9 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.7-3
 - rebuild for GCC 4.3


--- z88make.patch DELETED ---