← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_vc_build.m4

Merge Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_vc_build.m4
60
60
      mkdir -p config
61
61
    fi
62
62
 
63
 
    cat > config/pandora_vc_revinfo.tmp <<EOF
 
63
    if test "${pandora_building_from_bzr}" = "yes" -o ! -f config/pandora_vc_revinfo ; then 
 
64
      cat > config/pandora_vc_revinfo.tmp <<EOF
64
65
PANDORA_VC_REVNO=${PANDORA_VC_REVNO}
65
66
PANDORA_VC_REVID=${PANDORA_VC_REVID}
66
67
PANDORA_VC_BRANCH=${PANDORA_VC_BRANCH}
67
68
PANDORA_RELEASE_DATE=${PANDORA_RELEASE_DATE}
68
69
PANDORA_RELEASE_NODOTS_DATE=${PANDORA_RELEASE_NODOTS_DATE}
69
70
EOF
70
 
    if ! diff config/pandora_vc_revinfo.tmp config/pandora_vc_revinfo >/dev/null 2>&1 ; then
71
 
      mv config/pandora_vc_revinfo.tmp config/pandora_vc_revinfo
 
71
      if ! diff config/pandora_vc_revinfo.tmp config/pandora_vc_revinfo >/dev/null 2>&1 ; then
 
72
        mv config/pandora_vc_revinfo.tmp config/pandora_vc_revinfo
 
73
      fi
 
74
      rm -f config/pandora_vc_revinfo.tmp
72
75
    fi
73
 
    rm -f config/pandora_vc_revinfo.tmp
74
76
  ])
75
77
])
76
78