OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Feb-2004 16:58:46
Branch: HEAD Handle: 2004021615584500
Modified files:
openpkg-src/openpkg openpkg.boot
Log:
fix more internal l_prefix related processing
Summary:
Revision Changes Path
1.47 +4 -6 openpkg-src/openpkg/openpkg.boot
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.46 -r1.47 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 16 Feb 2004 14:49:00 -0000 1.46
+++ openpkg-src/openpkg/openpkg.boot 16 Feb 2004 15:58:45 -0000 1.47
@@ -146,9 +146,7 @@
if [ ".$bs" = .1 ]; then
srcdir=.
- if [ -d ../../DST ]; then
- dstdir=../../DST/openpkg
- elif [ -d ../../dst ]; then
+ if [ -d ../../dst ]; then
dstdir=../../dst/openpkg
else
dstdir=.
@@ -219,8 +217,8 @@
##
V_rpm=`grep V_rpm $spec | head -1 | awk '{ printf("%s", $3); }'`
-if [ -f "../../DST/openpkg/rpm-${V_rpm}.tar.gz" ]; then
- distdir="`cd ../../DST/openpkg; pwd`" # developer only
+if [ -f "../../dst/openpkg/rpm-${V_rpm}.tar.gz" ]; then
+ distdir="`cd ../../dst/openpkg; pwd`" # developer only
else
distdir="`pwd`"
fi
@@ -442,7 +440,7 @@
-e "s;\\(%{l_prefix}/lib/openpkg/rpmtool\\);%{l_bash} \\1;g" \
-e "s;@l_prefix_static@;$prefix;g" \
-e "s;@l_prefix@;$RPM_BUILD_ROOT$prefix;g" \
- -e "s;%l_prefix;%l_prefix_INTERNAL;g" \
+ -e "s;%l_prefix\\([^_]\\);%l_prefix_INTERNAL\\1;g" \
-e "s;%{l_prefix};%{l_prefix_INTERNAL};g" \
-e "s;^\\(%_specdir *\\).*;\\1 `pwd`;" \
-e "s;^\\(%_sourcedir *\\).*;\\1 $distdir;" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
