Skip to content

Commit

Permalink
Build: Do more when bootstrapping an fresh repo
Browse files Browse the repository at this point in the history
  • Loading branch information
beekhof committed Oct 5, 2015
1 parent b557a39 commit d506c60
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
5 changes: 1 addition & 4 deletions GNUmakefile
Expand Up @@ -51,17 +51,14 @@ LAST_RC ?= $(shell test -e /Volumes || git tag -l | grep Pacemaker | sort -Vr |
LAST_RELEASE ?= $(shell test -e /Volumes || git tag -l | grep Pacemaker | sort -Vr | grep -v rc | head -n 1)
NEXT_RELEASE ?= $(shell echo $(LAST_RELEASE) | awk -F. '/[0-9]+\./{$$3+=1;OFS=".";print $$1,$$2,$$3}')

beekhof:
echo $(LAST_RELEASE) $(NEXT_RELEASE)

BUILD_COUNTER ?= build.counter
LAST_COUNT = $(shell test ! -e $(BUILD_COUNTER) && echo 0; test -e $(BUILD_COUNTER) && cat $(BUILD_COUNTER))
COUNT = $(shell expr 1 + $(LAST_COUNT))

SPECVERSION ?= $(COUNT)

init:
./autogen.sh
./autogen.sh init

export:
rm -f $(PACKAGE)-dirty.tar.* $(PACKAGE)-tip.tar.* $(PACKAGE)-HEAD.tar.*
Expand Down
8 changes: 7 additions & 1 deletion autogen.sh
Expand Up @@ -30,8 +30,14 @@ if [ -f config.log ]; then
last=`grep --color=never "$.*configure" config.log | tail -n 1 | sed s:.*configure:./configure: | sed s:--no-create::`
echo " $last"
eval $last

elif [ "x$1" = xinit -a -e `which rpm` ]; then
cmd="./__configure.rpm"
rpm --eval %{configure} | grep -v program-prefix | sed 's/\t/ /' > $cmd
sh $cmd
make

else
echo Now run ./configure
echo "Now run configure with any arguments (eg. --prefix) specific to your system"
if [ -e `which rpm` ]; then
echo "Suggested invocation:"
Expand Down

0 comments on commit d506c60

Please sign in to comment.