OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Oct-2005 09:22:42
Branch: HEAD Handle: 2005101008224200
Modified files:
openpkg-src/bochs bochs.spec
Log:
make sure Bochs finds OpenPKG zlib; fix installation under Solaris by
using GNU shtool
Summary:
Revision Changes Path
1.44 +9 -1 openpkg-src/bochs/bochs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
============================================================================
$ cvs diff -u -r1.43 -r1.44 bochs.spec
--- openpkg-src/bochs/bochs.spec 27 Sep 2005 06:04:30 -0000 1.43
+++ openpkg-src/bochs/bochs.spec 10 Oct 2005 07:22:42 -0000 1.44
@@ -33,7 +33,7 @@
Group: Misc
License: LGPL
Version: 2.2.1
-Release: 20050927
+Release: 20051010
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ -81,11 +81,19 @@
-e 's;/etc/bochsrc;%{l_prefix}/etc/bochs/bochsrc;' \
config.cc
+ # fix installation procedure
+ %{l_shtool} subst \
+ -e 's;\(then\|else\|do\|=install\) install;\1 %{l_shtool} install
-c;g' \
+ -e 's;^\(.\)install;\1%{l_shtool} install -c;' \
+ Makefile.in
+
# configure the sources
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
--with-x11 \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
