← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Monty Taylor
  • Date: 2010-10-14 01:10:46 UTC
  • mto: This revision was merged to the branch mainline in revision 1846.
  • Revision ID: mordred@inaugust.com-20101014011046-5exsy9x3r9nv23ua
We _want_ to keep doing bzr versioning in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
30
30
man_MANS =
31
31
bin_PROGRAMS =
32
32
 
 
33
VERSION=$(PANDORA_RELEASE_VERSION)
 
34
 
33
35
SUBDIRS = .
34
36
if BUILD_PO
35
37
SUBDIRS += po
120
122
          echo '#define PKGLIBDIR "$(pkglibdir)"'; \
121
123
          echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
122
124
          echo '#define PKGPLUGINDIR "$(pkgplugindir)"'; \
 
125
          echo '#undef VERSION'; \
 
126
          echo '#define VERSION "${PANDORA_RELEASE_VERSION}"'; \
123
127
        } | sed '/""/d' > $@-t
124
128
        @if diff $@-t $@ >/dev/null 2>&1 ; then \
125
129
          rm @-t ; \