fix/revert 20519 and 20521

diff --git a/build.xml b/build.xml
index b4ac5d24aae1539d6a99ddaeaaa7f846e00cb596..281364e81672302aae791efa07ba5ef1b1f71509 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -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 3e28ec5b1a476eab8a4d71875fda4f43e234eddc..327eb7c73ede2a66625682a23b6e851669092da7 100644 (file)
--- 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"