X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=configure;h=64a623297c64d48ada22b1532d06d88fad7e6d73;hb=771f492aea2991c2ba1af3b6dcfa8a66f050b7b7;hp=f02dad868f1a608f56f93a312247f6df0266f07c;hpb=c30f4d5abc918706a6e81498c0dca6a75b584e43;p=lfsbookja%2Flfsja-git.git diff --git a/configure b/configure index f02dad86..64a62329 100755 --- a/configure +++ b/configure @@ -623,7 +623,7 @@ TAKAOMFONTDIR TAKAOGFONTDIR FOP LYNX -SVNVER +GITVER DUMPDIR NOCHUNKS_OUTPUT NOCHUNKS_NAME @@ -4737,24 +4737,34 @@ fi -TARGETVER=r11.0-30 +TARGETVER=r11.1-50 +if test "x$revspec" = "xsystemd"; then + TARGETVER="$TARGETVER-systemd" +fi -(cd ${bookdir} && sh git-version.sh) -if test -f ${bookdir}/version.ent; then - SVNVER=`grep 'ENTITY version ' ${bookdir}/version.ent | sed -e 's/^$//' | tr 'A-Z' 'a-z'` -else - SVNVER='unknown' +(cd ${bookdir} && sh git-version.sh $revspec) +cp -p ${bookdir}/version.ent . +if test -f ./version.ent; then + rm -f version.tmp + if test "x$revspec" = "xsysv"; then + grep -A1 "%sysv" version.ent >version.tmp + elif test "x$revspec" = "xsystemd"; then + grep -A1 "%systemd" version.ent >version.tmp + else + echo >version.tmp + fi + GITVER=`grep 'ENTITY version ' version.tmp | sed -e 's/^/\1/'` fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the original XML version" >&5 printf %s "checking for the original XML version... " >&6; } -if test ! "$SVNVER" = "$TARGETVER"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SVNVER" >&5 -printf "%s\n" "$SVNVER" >&6; } +if test ! "$GITVER" = "$TARGETVER"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GITVER" >&5 +printf "%s\n" "$GITVER" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Version of the original XML not $TARGETVER" >&5 printf "%s\n" "$as_me: WARNING: Version of the original XML not $TARGETVER" >&2;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SVNVER" >&5 -printf "%s\n" "$SVNVER" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GITVER" >&5 +printf "%s\n" "$GITVER" >&6; } fi