diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2009-01-17 21:08:03 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2009-01-17 21:08:03 +0000 |
| commit | 18cb10f4bb74bdf4b55a253ee98f8307e446b916 (patch) | |
| tree | 9031b4c979107e60887ef2cf7a0361e63536d7d9 | |
| parent | fix bug ! (diff) | |
| download | inkscape-18cb10f4bb74bdf4b55a253ee98f8307e446b916.tar.gz inkscape-18cb10f4bb74bdf4b55a253ee98f8307e446b916.zip | |
fix/revert 20519 and 20521
(bzr r7142)
| -rw-r--r-- | build.xml | 4 | ||||
| -rw-r--r-- | src/menus-skeleton.h | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -131,7 +131,7 @@ #define GETTEXT_PACKAGE "inkscape" - #define PACKAGE_STRING INKSCAPE_VERSION + #define PACKAGE_STRING VERSION #define HAVE_GETOPT_H 1 #define HAVE_STRING_H 1 @@ -367,7 +367,7 @@ -fopenmp </flags> <defines> - -DINKSCAPE_VERSION=\"${version}\" + -DVERSION=\"${version}\" -DHAVE_CONFIG_H -D_INTL_REDIRECT_INLINE -DHAVE_SSL diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index 3e28ec5b1..327eb7c73 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -1,7 +1,7 @@ #ifndef SEEN_MENUS_SKELETON_H #define SEEN_MENUS_SKELETON_H -#include <inkscape-version.h> +#include "config.h" #ifdef __cplusplus #undef N_ @@ -9,7 +9,7 @@ #endif static char const menus_skeleton[] = -"<inkscape version=\"1\"\n" +"<inkscape version=\"" VERSION "\"\n" " xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\"\n" " xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\">\n" "\n" |