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: 18-Oct-2007 14:35:09 Branch: HEAD Handle: 2007101813350800 Modified files: openpkg-src/db45 db45.pc db45.spec Log: use an easier layout Summary: Revision Changes Path 1.2 +2 -2 openpkg-src/db45/db45.pc 1.2 +10 -10 openpkg-src/db45/db45.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/db45/db45.pc ============================================================================ $ cvs diff -u -r1.1 -r1.2 db45.pc --- openpkg-src/db45/db45.pc 18 Oct 2007 12:19:22 -0000 1.1 +++ openpkg-src/db45/db45.pc 18 Oct 2007 12:35:08 -0000 1.2 @@ -1,7 +1,7 @@ [EMAIL PROTECTED]@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include +libdir=${exec_prefix}/lib/db45 +includedir=${prefix}/include/db45 Name: db45 Description: Berkeley-DB Library @@ . patch -p0 <<'@@ .' Index: openpkg-src/db45/db45.spec ============================================================================ $ cvs diff -u -r1.1 -r1.2 db45.spec --- openpkg-src/db45/db45.spec 18 Oct 2007 12:19:22 -0000 1.1 +++ openpkg-src/db45/db45.spec 18 Oct 2007 12:35:08 -0000 1.2 @@ -100,6 +100,8 @@ GREP="grep" \ ../dist/configure \ --prefix=%{l_prefix} \ + --includedir=%{l_prefix}/include/db45 \ + --libdir=%{l_prefix}/lib/db45 \ --disable-compat185 \ --disable-cxx \ --disable-java \ @@ -115,21 +117,19 @@ rm -rf $RPM_BUILD_ROOT ( cd build_unix %{l_make} %{l_mflags} install \ - prefix=$RPM_BUILD_ROOT%{l_prefix} + prefix=$RPM_BUILD_ROOT%{l_prefix} \ + includedir=$RPM_BUILD_ROOT%{l_prefix}/include/db45 \ + libdir=$RPM_BUILD_ROOT%{l_prefix}/lib/db45 ) || exit $? # strip down installation - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libdb-[0-9]*.a strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true - rm -f $RPM_BUILD_ROOT%{l_prefix}/include/db_185.h - rm -f $RPM_BUILD_ROOT%{l_prefix}/include/db_cxx.h - rm -f $RPM_BUILD_ROOT%{l_prefix}/include/cxx_*.h + rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/db45/libdb-[0-9]*.a + rm -f $RPM_BUILD_ROOT%{l_prefix}/include/db45/db_185.h + rm -f $RPM_BUILD_ROOT%{l_prefix}/include/db45/db_cxx.h + rm -f $RPM_BUILD_ROOT%{l_prefix}/include/db45/cxx_*.h # cleanup namespace - mv $RPM_BUILD_ROOT%{l_prefix}/include/db.h \ - $RPM_BUILD_ROOT%{l_prefix}/include/db45.h - mv $RPM_BUILD_ROOT%{l_prefix}/lib/libdb.a \ - $RPM_BUILD_ROOT%{l_prefix}/lib/libdb45.a ( cd $RPM_BUILD_ROOT%{l_prefix}/bin for bin in db_*; do mv $bin `echo $bin | sed -e 's;^db_;db45_;'` @@ -137,7 +137,7 @@ ) || exit $? # install pkg-config configuration - libs="-ldb45" + libs="-ldb" case "%{l_platform -t}" in *-sunos* ) libs="$libs -lrt" ;; esac @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org