← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: patrick crews
  • Date: 2010-10-14 01:23:29 UTC
  • mfrom: (1845.1.1 elliott)
  • mto: This revision was merged to the branch mainline in revision 1847.
  • Revision ID: gleebix@gmail.com-20101014012329-3v7q2tefhhsblkil
Merge in Monty's code for version changes

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
 
 
35
33
SUBDIRS = .
36
34
if BUILD_PO
37
35
SUBDIRS += po
122
120
          echo '#define PKGLIBDIR "$(pkglibdir)"'; \
123
121
          echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
124
122
          echo '#define PKGPLUGINDIR "$(pkgplugindir)"'; \
125
 
          echo '#undef VERSION'; \
126
 
          echo '#define VERSION "${PANDORA_RELEASE_VERSION}"'; \
127
123
        } | sed '/""/d' > $@-t
128
124
        @if diff $@-t $@ >/dev/null 2>&1 ; then \
129
125
          rm @-t ; \