Hi Wolfgang,
Sorry, there was a mistake in the documentation, I've updated it right
now, and it will be visible tomorrow. The order of update should be:
cd bibledit
git reset --hard
git pull
./configure
make
sudo make install
Regards,
Teus.
Wolfgang Stradner E wrote:
Hi,
Wanted to update BE 3.1.44 to 3.1.55 but have a problem with Makefile.
How to update it?
I checked in Help/Development
but did not find any explanation for it.
-----------------------------------------
address@hidden:~$ cd bibledit
address@hidden:~/bibledit$ git pull
remote: Counting objects: 354, done.
remote: Compressing objects: 100% (276/276), done.
Indexing 277 objects...
remote: Total 277 (delta 242), reused 0 (delta 0)
100% (277/277) done
Resolving 242 deltas...
100% (242/242) done
67 objects were added to complete this thin pack.
* refs/remotes/origin/master: fast forward to branch 'master' of
git://git.savannah.nongnu.org/bibledit
old..new: fb3c789..203f834
Updating fb3c789..203f834
Makefile: needs update
config.log: needs update
config.status: needs update
desktop/Makefile: needs update
doc/.deps/allpages.Po: needs update
doc/.deps/contents.Po: needs update
doc/Makefile: needs update
eeepc/Makefile: needs update
man/Makefile: needs update
olpc/.deps/bibledit-olpc-libraries.Po: needs update
olpc/Makefile: needs update
pix/Makefile: needs update
scripts/Makefile: needs update
src/Makefile: needs update
templates/Makefile: needs update
tests/Makefile: needs update
windows/Makefile: needs update
fatal: Entry 'Makefile' not uptodate. Cannot merge.
address@hidden:~/bibledit$
teus wrote:
merge bug fix
resize fix
|