Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 20 years ago
parent
commit
5dc2c278ee
4 changed files with 6 additions and 3 deletions
  1. +1
    -0
      Documentation/Developers/PKG-BUILD-VARS
  2. +1
    -0
      package/base/acl/acl.conf
  3. +1
    -1
      scripts/Build-Pkg
  4. +3
    -2
      scripts/functions

+ 1
- 0
Documentation/Developers/PKG-BUILD-VARS

@ -78,6 +78,7 @@ patchopt ...... options passed to the patch program
preconf ....... command to execute before running configure
runconf ....... set to '0' if you want to skip running configure
autogen ....... set to '1' if you want to run the autogen script
automakever ... automake version prefix (e.g. "-1.7") for $autogen
confopt ....... options for GNU autoconf './configure'
extraconfopt .. options which should be appended to $confopt by set_confopt()
configprefix .. variable declarations only for GNU autoconf './configure'

+ 1
- 0
package/base/acl/acl.conf

@ -21,6 +21,7 @@
# --- ROCK-COPYRIGHT-NOTE-END ---
# see hotfixes in autoconf.patch
automakever="-1.7"
autogen=1
# do not try to detect rpm

+ 1
- 1
scripts/Build-Pkg

@ -503,7 +503,7 @@ finish="" ; hook_add finish 5 'eval "$finish"'
[ "$ROCKCFG_DO_CHECK" = 1 ] && hook_add inmake 6 'run_check'
hook_add postflist 3 'postflist_static_lib'
configprefix="" ; autogen=0
configprefix="" ; autogen=0 ; automakever=""
configscript="./configure" ; extraconfopt=""
srcdir=auto ; srctar=auto

+ 3
- 2
scripts/functions

@ -237,9 +237,10 @@ function eval_config_command() {
sh autogen.sh
else
echo "Running builtin autogen script."
libtoolize --force --automake ; aclocal
libtoolize --force --automake
aclocal$automakever
if grep AM_INIT_AUTOMAKE configure.[ia][nc]
then automake ; fi
then automake$automakever ; fi
autoconf
fi
fi

Loading…
Cancel
Save