aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortoni <matzeton@googlemail.com>2015-11-16 23:18:45 +0100
committertoni <matzeton@googlemail.com>2015-11-16 23:18:45 +0100
commit089551924a7c6bae2b03bee9999e5563f9267571 (patch)
tree93609cc2980068590fe21e0423fd489f55e3a236 /src
parent5dcfb21b85391ddaace3ec7e2161859661894597 (diff)
(auto(conf|make)|dpkg) versioning fix (src/version.h shows the
DEFINITIVE version of the pkg)
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/config.h8
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 07b4cfa..aab865c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
bin_PROGRAMS=naskpass
-naskpass_SOURCES=main.c opt.c status.c ui_ani.c ui.c ui_elements.c ui_input.c ui_ipc.c ui_nwindow.c ui_statusbar.c
+naskpass_SOURCES=main.c opt.c status.c ui_ani.c ui.c ui_elements.c ui_input.c ui_ipc.c ui_txtwindow.c ui_statusbar.c
diff --git a/src/config.h b/src/config.h
index 9d72ef3..797376f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -12,8 +12,10 @@
#define MSQ_PWD "/naskpass-passwd"
#define MSQ_INF "/naskpass-info"
-#ifdef _VERSION
-#define VERSION _VERSION
-#else
+#ifdef HAVE_CONFIG_H
+#include "version.h"
+#endif
+
+#ifndef VERSION
#define VERSION "unknown"
#endif