Skip to content

Commit

Permalink
buildtypes: Rename buildtype configure to autotools
Browse files Browse the repository at this point in the history
  • Loading branch information
mariux committed Oct 10, 2012
1 parent 790e16f commit ba5cf3d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ HELPER_SHELL+=bee-cache-update
LIBRARY_SHELL+=beelib.config.sh

BUILDTYPES+=autogen
BUILDTYPES+=autotools
BUILDTYPES+=cmake
BUILDTYPES+=configure
BUILDTYPES+=jb
BUILDTYPES+=make
BUILDTYPES+=perl-module
Expand Down
6 changes: 6 additions & 0 deletions buildtypes/configure.sh.in → buildtypes/autotools.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

#### detect autotools build type ##############################################

if [ ! -x "${S}/configure" ] ; then
return
fi
Expand All @@ -32,6 +34,8 @@ if ! egrep -qi "generated by.*autoconf" "${S}/configure" ; then
return
fi

#### set autotools build type #################################################

BEE_BUILDTYPE=configure

#### bee_configure() ##########################################################
Expand All @@ -52,6 +56,8 @@ bee_install() {
start_cmd make ${BEE_MAKEFLAGS} install DESTDIR=${D} "$@"
}

#### setup autotools build type ###############################################

if ! grep -q datarootdir ${S}/configure ; then
BEE_CONFIGURE='compat'
fi
Expand Down
2 changes: 1 addition & 1 deletion src/beesh.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ bee_run patch ${bee_PATCHFILES[@]}

bee_buildmagic=$(${BEE_BINDIR}/beeuniq ${BEE_BUILDTYPE[@]} \
cmake \
configure \
autotools \
autogen \
perl-module \
perl-module-makemaker \
Expand Down

0 comments on commit ba5cf3d

Please sign in to comment.