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: 22-Nov-2002 12:35:16 Branch: HEAD Handle: 2002112211351600 Modified files: openpkg-src/openpkg rpmmacros Log: make macros more robust Summary: Revision Changes Path 1.22 +2 -2 openpkg-src/openpkg/rpmmacros ____________________________________________________________________________ Index: openpkg-src/openpkg/rpmmacros ============================================================ $ cvs diff -u -r1.21 -r1.22 rpmmacros --- openpkg-src/openpkg/rpmmacros 22 Nov 2002 11:30:58 -0000 1.21 +++ openpkg-src/openpkg/rpmmacros 22 Nov 2002 11:35:16 -0000 1.22 @@ -161,8 +161,8 @@ # tool options %l_mflags(O) %(%{l_sane_env}; %{l_rpmtool} flags -m %{-O:-O} %{l_make}) %l_cflags(O) %(%{l_sane_env}; %{l_rpmtool} flags -c %{-O:-O} %{l_cc}) -%l_cppflags() %(flags="-I%{l_prefix}/include"; for pkg in %*; do flags="$flags -I%{l_prefix}/include/$pkg"; done; echo $flags) -%l_ldflags() %(flags="-L%{l_prefix}/lib"; for pkg in %*; do flags="$flags -L%{l_prefix}/lib/$pkg"; done; echo $flags) +%l_cppflags() %(flags="-I%{l_prefix}/include"; for pkg in . %*; do test ".$pkg" = .. && continue; flags="$flags -I%{l_prefix}/include/$pkg"; done; echo $flags) +%l_ldflags() %(flags="-L%{l_prefix}/lib"; for pkg in . %*; do test ".$pkg" = .. && continue; flags="$flags -L%{l_prefix}/lib/$pkg"; done; echo $flags) # determine the current username %l_whoami %((id -un) 2>/dev/null || (whoami) 2>/dev/null || (who am i | cut "-d " -f1) 2>/dev/null || echo $LOGNAME) ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]