Bladeren bron

avoid infinite loop with src2make Makefile when non-GNU-make ignores -v, finds Makefile and runs "all" target

Thomas Lotterer 23 jaren geleden
bovenliggende
commit
64f11bdd31
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 2 2
      openpkg/openpkg.spec
  2. 1 1
      openpkg/rpmtool

+ 2 - 2
openpkg/openpkg.spec

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

+ 1 - 1
openpkg/rpmtool

@@ -319,7 +319,7 @@ case $tool in
         tool="$1"
         if [ ".$opt_m" = .yes ]; then
             isgmake=no
-            if [ ".`$tool -v 2>/dev/null | grep 'GNU Make'`" != . ]; then
+            if [ ".`$tool -v -f /dev/null 2>/dev/null | grep 'GNU Make'`" != . ]; then
                 isgmake=yes
             fi
             mflags=''