瀏覽代碼

add l_cppflags and l_ldflags support; support lower-case dev dirs, too

Ralf S. Engelschall 24 年之前
父節點
當前提交
3e4d6887ea
共有 3 個文件被更改,包括 10 次插入2 次删除
  1. 6 0
      openpkg/openpkg.boot
  2. 2 2
      openpkg/openpkg.spec
  3. 2 0
      openpkg/rpmmacros

+ 6 - 0
openpkg/openpkg.boot

@@ -104,6 +104,8 @@ if [ ".$bs" = .1 ]; then
     srcdir=.
     if [ -d ../../DST ]; then
        dstdir=../../DST/openpkg
+    elif [ -d ../../dst ]; then
+       dstdir=../../dst/openpkg
     else
        dstdir=.
     fi
@@ -116,6 +118,10 @@ if [ ".$bs" = .1 ]; then
        pkgdir=../../PKG/SRC
     elif [ -d ../../PKG ]; then
        pkgdir=../../PKG
+    elif [ -d ../../pkg/src ]; then
+       pkgdir=../../pkg/src
+    elif [ -d ../../pkg ]; then
+       pkgdir=../../pkg
     else
        pkgdir=..
     fi

+ 2 - 2
openpkg/openpkg.spec

@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 20020412
-%define       R_openpkg 20020412
+%define       V_openpkg 20020415
+%define       R_openpkg 20020415
 
 #   the used software versions
 %define       V_rpm     4.0.2

+ 2 - 0
openpkg/rpmmacros

@@ -161,6 +161,8 @@
 #   tool options
 %l_mflags(O)             %(%{l_rpmtool} flags -m %{-O:-O} %{l_make})
 %l_cflags(O)             %(%{l_rpmtool} flags -c %{-O:-O} %{l_cc})
+%l_cppflags              -I%{l_prefix}/include
+%l_ldflags               -L%{l_prefix}/lib
 
 #   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)